Merge branch 'develop'

Author: thelink2012

.gitignore

@@ -7,7 +7,7 @@
 /msvc-gtasa/
 /nbproject/
 /release/
-
+/premake5.exe
 
 
 #################

README.md

@@ -10,18 +10,18 @@ Still not sure? Check out [this](https://www.youtube.com/watch?v=TvRpQa8dJ7E) ni
 
 Requirements:
 
-+ [Premake 5](http://industriousone.com/premake/download) *(pre-built executable available in this repository root)*
-+ [Visual Studio](http://www.visualstudio.com/downloads) 2013 or greater.
++ [Premake 5](https://premake.github.io/download/) *(install with `winget install -e --id Premake.Premake.5.Beta`, or download from the official website)*
++ [Visual Studio](https://www.visualstudio.com/downloads) 2017 or greater.
++ [Windows XP Platform Toolset](https://learn.microsoft.com/en-us/cpp/build/configuring-programs-for-windows-xp) is required; add it from Visual Studio’s Individual Components Installer if needed.
 
 Run the following command in the root of this directory to generate the project files:
 
-    premake5 vs2013
+    premake5 vs2022
 
 You can install the generated binaries into your game directory by running:
 
     premake5 install "C:/Program Files (x86)/Rockstar Games/GTA San Andreas"
 
-Or, you might want the files to be automatically installed everytime you build the solution:
+Or, you might want the files to be automatically installed every time you build the solution:
 
-    premake5 vs2013 "--idir=C:/Program Files (x86)/Rockstar Games/GTA San Andreas"
-
+    premake5 vs2022 "--idir=C:/Program Files (x86)/Rockstar Games/GTA San Andreas"

doc/config/modloader.ini.0

@@ -3,15 +3,17 @@
 ;
 [Folder.Config]
 Profile = Default                 ; Profile to be used to configure mods
+PriorityLimit = 100               ; Max allowed value in Profiles.*.Priority (minimum is 1)
 
 [Profiles.Default.Config]
 IgnoreAllMods  = false            ; Ignores all mods. This essentially disables mods loading.
 ExcludeAllMods = false            ; Excludes all mods from being loaded except the ones at IncludeMods list
 
 [Profiles.Default.Priority]
 ; Defines mods priority (which mods should go into effect if both replaces the same file)
-; The priority should be between 1 and 100, where 100 overrides 1, additionally priority 0 makes be ignored (just like IgnoreMods)
-; The default priority is 50!
+; The priority should be between 1 and PriorityLimit, where higher values override lower ones.
+; Additionally priority 0 makes the mod be ignored (just like IgnoreMods).
+; The default priority is 50.
 ;MyMod=50
 
 [Profiles.Default.IgnoreFiles]

include/modloader/modloader.h

@@ -29,9 +29,9 @@ extern "C" {
 /* Version */
 #define MODLOADER_VERSION_MAJOR         0
 #define MODLOADER_VERSION_MINOR         3
-#define MODLOADER_VERSION_REVISION      7
+#define MODLOADER_VERSION_REVISION      9
 #ifdef NDEBUG
-#define MODLOADER_VERSION_ISDEV         0
+#define MODLOADER_VERSION_ISDEV         1
 #else
 #define MODLOADER_VERSION_ISDEV         1
 #endif

premake5.exe

@@ -59,8 +59,8 @@ newaction {
     Install Functionality
 --]]
 install_files = {}
-cmd_copyfile = os.is("windows") and { "xcopy", "/f /y /i" }    or { "cp", "-v" }
-cmd_copydir  = os.is("windows") and { "xcopy", "/e /f /y /i" } or { "cp", "-vr" }
+cmd_copyfile = os.ishost("windows") and { "xcopy", "/f /y /i" }    or { "cp", "-v" }
+cmd_copydir  = os.ishost("windows") and { "xcopy", "/e /f /y /i" } or { "cp", "-vr" }
 
 -- Gets the install command for the specified file
 function installcommand(file, destdir)
@@ -164,11 +164,11 @@ function dummyproject()
     flags { "NoPCH" }
 
     -- Dummy cpp file for Premake's generated none  project (bug workaround)
-    configuration "gmake"
+    filter "action:gmake*"
         kind "StaticLib"
         files { "src/shared/dummy.cpp" }
 
-    configuration {}
+    filter {}
 end
 
 --[[
@@ -184,10 +184,10 @@ solution "modloader"
     targetprefix "" -- no 'lib' prefix on gcc
     targetdir "bin"
     implibdir "bin"
+    staticruntime "On"
+    symbols "On" -- Produce symbols whenever possible for logging purposes
 
     flags {
-        "StaticRuntime",
-        "Symbols",          -- Produce symbols whenever possible for logging purposes
         "NoImportLib",      -- Mod Loader itself and it's plugins are dlls which exports some funcs but a implib isn't required
         --"NoRTTI", (std.data uses it now on handling.cpp)
         "NoBufferSecurityCheck"
@@ -214,26 +214,23 @@ solution "modloader"
         "src/shared",
     }
 
-    configuration "Debug*"
-        flags { "Symbols" }
+    filter "configurations:Debug*"
+        symbols "On"
 
-    configuration "Release*"
+    filter "configurations:Release*"
         defines { "NDEBUG" }
         optimize "Speed"
 
-    configuration "gmake"
+    filter "action:gmake*"
         buildoptions { "-std=gnu++14", "-Wno-deprecated" }
-    configuration "vs*"
+
+    -- Visual Studio 2017+ (v141_xp)
+    filter "action:vs*"
+        toolset "v141_xp"
         buildoptions { "/arch:IA32" }           -- disable the use of SSE/SSE2 instructions (old game, old computers)
         buildoptions { "/Zm250", "/bigobj" }    -- gta3.std.data is a monster
-
-    configuration "vs2012"
-        toolset "v110_xp"
-    configuration "vs2013"
-        toolset "v120_xp"
-    configuration "vs2015"
-        toolset "v140_xp"
-        buildoptions { "/Zc:threadSafeInit-" }
+        buildoptions { "/Zc:threadSafeInit-" }  -- threadSafeInit not available in WinXP
+    filter {}
 
     project "docs"
         dummyproject()
@@ -272,8 +269,9 @@ solution "modloader"
     project "shared"
         dummyproject()
         setupfiles "src/shared"
-        configuration { "gmake" }
+        filter "action:gmake*"
             includedirs { "src/shared/stdinc" } -- gmake compatibility since it'll compile the dummyproject
+        filter {}
 
 
     local gta3_plugins = {  -- ordered by time taken to compile

premake5.lua

@@ -242,7 +242,8 @@ void Loader::UpdateOldConfig_0115_021()
             for(auto& kv : newer["Priority"])
             {
                 auto pr = std::stoi(kv.second);
-                kv.second = std::to_string(pr > 0 && pr <= 100? 101 - pr : pr);
+                auto limit = this->mods.GetPriorityLimit();
+                kv.second = std::to_string(pr > 0 && pr <= limit? (limit + 1) - pr : pr);
             }
 
             newer.write_file(gamePath + "modloader/" +  folderConfigFilename);

src/core/config.cpp

@@ -610,7 +610,7 @@ void TheMenu::ModPageEvents()
     // Helper function to setup a integer priority entry in the menu
     auto SetupPriorityEntry = [this](const char* label, uint32_t& priority, std::function<void(MenuEntry&)> cb) -> std::function<bool(ActionInfo&)>
     {
-        static const uint32_t min = 0, max = 100, step = 1;
+        const uint32_t min = 0, max = loader.mods.GetPriorityLimit(), step = 1;
 
         auto PriorityLabel = [](const uint32_t& priority)
         {
@@ -624,10 +624,14 @@ void TheMenu::ModPageEvents()
             entry->SetHelper(HelpLabel(label));
             entry->OnStateChange(cb);
 
-            auto fInitStates = entry->SetupStatefulEntry(std::ref(priority), std::ref(PriorityLabel), [](const uint32_t& value, ActionInfo& info)
-            {
-                return std::min(std::max((value + step * info.wheel), min), max);
-            });
+            auto fInitStates = entry->SetupStatefulEntry(
+                std::ref(priority),
+                std::ref(PriorityLabel),
+                [min, max, step](const uint32_t& value, ActionInfo& info)
+                {
+                    return std::min(std::max((value + step * info.wheel), min), max);
+                }
+            );
 
             return fInitStates;
         }

src/core/extras/gta3/menu.cpp

@@ -14,8 +14,8 @@ using namespace modloader;
 void Loader::FolderInformation::Clear()
 {
     mods.clear();
-    profiles.clear();
-    current_profile = nullptr;
+    RemoveProfiles();
+    priority_limit = default_priority_limit;
 }
 
 /*
@@ -127,8 +127,9 @@ void Loader::FolderInformation::RemoveReferencesToProfile(Loader::Profile& rm)
  */
 void Loader::FolderInformation::RemoveProfiles()
 {
-    for(auto it = this->profiles.begin(); it != this->profiles.end(); )
-        it = this->profiles.erase(it);  // Profile destructor automatically cleans this->current_profile
+    for(auto& prof : this->profiles)
+        RemoveReferencesToProfile(prof);
+    this->profiles.clear();
 }
 
 /*
@@ -374,7 +375,13 @@ void Loader::FolderInformation::LoadConfigFromINI()
 
     // First take the profiles from modloader.ini
     if(ini.load_file(loader.folderConfigFilename))
+    {
+        const auto default_limit = std::to_string(default_priority_limit);
+        const auto priority_limit = std::strtol(ini.get("Folder.Config", "PriorityLimit", default_limit).c_str(), 0, 0);
+        this->SetPriorityLimit(priority_limit);
+
         ReadProfilesFromINI(ini, "");
+    }
     else
         Log("Warning: Failed to load folder config file");
 
@@ -411,6 +418,7 @@ void Loader::FolderInformation::SaveConfigForINI()
 
     // Save current profile
     ini.set("Folder.Config", "Profile", this->Profile().GetName());
+    ini.set("Folder.Config", "PriorityLimit", std::to_string(this->GetPriorityLimit()));
 
     // Save all the profiles
     for(auto& profile : this->profiles)

src/core/folder.cpp

@@ -34,6 +34,8 @@ static const char* downurl = "https://github.com/thelink2012/modloader/releases"
 //
 static const char* default_profile_name = "Default";
 
+static const int default_priority_limit = 100;
+
 // Functor for sorting based on priority
 template<class T>
 struct SimplePriorityPred
@@ -272,7 +274,6 @@ class Loader : public modloader_t
                 {}
 
                 Profile(const Profile&) = default;
-                ~Profile();
 
                 //
                 FolderInformation& Parent() const  { return this->parent; }
@@ -413,6 +414,9 @@ class Loader : public modloader_t
 
                 // Gets the path to this modfolder (relative to gamedir, normalized)
                 const std::string& GetPath() { return path; }
+
+                int GetPriorityLimit() const { return this->priority_limit; }
+                void SetPriorityLimit(int value) { this->priority_limit = std::max(value, 1); }
 
                 // Clears all buffers from this structure
                 void Clear();
@@ -454,6 +458,7 @@ class Loader : public modloader_t
                 Loader::Profile*            current_profile;// Curretly selected profile from the 'profiles' list
                 std::unique_ptr<Loader::Profile> anon_profile;// Forced temporary profile (made by command line, conditionals, etc)
                                                                     // The .first boolean specifies whether we have a temporary profile
+                int priority_limit = default_priority_limit; // Max allowed priority for mods in this folder config
 
             protected:
                 void SetUnchanged() { if(status != Status::Removed) status = Status::Unchanged; }