Merge pull request #7 from thelink2012/name-fix

Changed some limits names

Author: ThirteenAG

doc/limit_adjuster_gta3vcsa.ini

@@ -16,12 +16,12 @@ NodeRoute = 64
 TaskAllocator = 16
 PedIntelligence = 140
 PedAttractors = 64
-StaticMatrices = 90000
+MatrixList = 90000
 OutsideWorldWaterBlocks = 500
-AlphaEntityListSize = 25000
+AlphaEntityList = 1250
 InVisibleEntityPtrs = 5000
 VisibleEntityPtrs = 5000
-StreamingObjectInstancesListSize = 90000
+StreamingObjectInstancesList = 7500
 TimeModels = 1500
 
 [VCLIMITS]
@@ -35,7 +35,7 @@ Objects = 3500
 Dummys = 9500
 AudioScriptObj = 192
 ColModel = 10500
-AlphaEntityListSize = 25000
+AlphaEntityList = 1250
 InVisibleEntityPtrs = 5000
 VisibleEntityPtrs = 5000
 TimeModels = 1500
@@ -48,7 +48,10 @@ Vehicles = 110
 Buildings = 35500
 Objects = 9500
 Dummys = 22802
-AlphaEntityListSize = 25000
+AlphaEntityList = 1250
 InVisibleEntityPtrs = 5000
 VisibleEntityPtrs = 5000
 TimeModels = 1500
+
+[OPTIONS]
+DebugTextKey = 0x74		; F5 -- Use an VKEY (see http://msdn.microsoft.com/pt-br/library/windows/desktop/dd375731(v=vs.85).aspx)

src/AlphaEntityList.cpp

@@ -9,7 +9,7 @@
 class AlphaEntityListIII : public SimpleAdjuster
 {
 public:
-	const char* GetLimitName() { return GetGVM().IsIII() ? "AlphaEntityListSize" : nullptr; }
+	const char* GetLimitName() { return GetGVM().IsIII() ? "AlphaEntityList" : nullptr; }
 	void ChangeLimit(int, const std::string& value)
 	{
 		injector::WriteMemory(0x527E6B + 1, std::stoi(value), true);
@@ -28,7 +28,7 @@ class AlphaEntityListIII : public SimpleAdjuster
 class AlphaEntityListVC : public SimpleAdjuster
 {
 public:
-	const char* GetLimitName() { return GetGVM().IsVC() ? "AlphaEntityListSize" : nullptr; }
+	const char* GetLimitName() { return GetGVM().IsVC() ? "AlphaEntityList" : nullptr; }
 	void ChangeLimit(int, const std::string& value)
 		{
 			injector::WriteMemory(0x5828DB+1, std::stoi(value), true);
@@ -48,12 +48,13 @@ class AlphaEntityListVC : public SimpleAdjuster
 class AlphaEntityListSA : public SimpleAdjuster
 {
 public:
-	const char* GetLimitName() { return GetGVM().IsSA() ? "AlphaEntityListSize" : nullptr; }
+	const char* GetLimitName() { return GetGVM().IsSA() ? "AlphaEntityList" : nullptr; }
 
 	void ChangeLimit(int, const std::string& value)
 	{
-			injector::WriteMemory(0x733B05, std::stoi(value), true);
-			injector::WriteMemory(0x733B55, std::stoi(value), true);
+        auto size = std::stoi(value) * 20;
+	    injector::WriteMemory(0x733B05, size, true);
+	    injector::WriteMemory(0x733B55, size, true);
 	}
 
     // TODO GetUsage

src/CMakeLists.txt

@@ -4,11 +4,11 @@ set(SOURCE_FILES
 dllmain.cpp
 Pools.cpp
 WaterBlocks.cpp
-StaticMatrices.cpp
+MatrixList.cpp
 AlphaEntityList.cpp
 InVisibleEntityPtrs.cpp
-StreamingObjectInstancesListSize.cpp
-TimeModelInfo.cpp
+StreamingObjectInstancesList.cpp
+TimeModels.cpp
 
 LimitAdjuster.h
 utility/PoolAdjuster.hpp

src/StaticMatrices.cpp src/MatrixList.cppsrc/StaticMatrices.cpp renamed to src/MatrixList.cpp

@@ -15,8 +15,7 @@ struct StaticMatrices : public SimpleAdjuster
     // Limit Name
     const char* GetLimitName()
     {
-        return (GetGVM().IsSA()? "StaticMatrices" : nullptr);   // Name is wrong, should be Matrices, or MatrixArray, or something
-                                                                // Can we change it or...?
+        return (IsSA()? "MatrixList" : nullptr);
     }
 
     // Sets the limit

src/StreamingObjectInstancesListSize.cpp src/StreamingObjectInstancesList.cppsrc/StreamingObjectInstancesListSize.cpp renamed to src/StreamingObjectInstancesList.cpp

@@ -15,14 +15,15 @@ struct StreamingObjectInstancesListSize : public SimpleAdjuster
 	// Limit Name
 	const char* GetLimitName()
 	{
-		return (GetGVM().IsSA()? "StreamingObjectInstancesListSize" : nullptr);
+		return (GetGVM().IsSA()? "StreamingObjectInstancesList" : nullptr);
 	}
 
 	// Sets the limit
 	void ChangeLimit(int, const std::string& value)
 	{
-		injector::WriteMemory(0x5B8E55, std::stoi(value), true);
-		injector::WriteMemory(0x5B8EB0, std::stoi(value), true);
+        auto size = std::stoi(value) * 12;
+		injector::WriteMemory(0x5B8E55, size, true);
+		injector::WriteMemory(0x5B8EB0, size, true);
 	}
 
     // TODO GetUsage

src/TimeModelInfo.cpp src/TimeModels.cppsrc/TimeModelInfo.cpp renamed to src/TimeModels.cpp

@@ -16,6 +16,7 @@ struct LimitHandler
     Adjuster*   adjuster;   // Adjuster to handle the key
 };
 
+static int vkDebugText = VK_F5; // 0x74
 int AdjustLimits();
 void AdjustLimits(const std::map<std::string, std::string>&);
 void PatchDrawer();
@@ -63,6 +64,22 @@ int AdjustLimits()
     else if(Adjuster::IsVC()) secname = "VCLIMITS";
     else if(Adjuster::IsIII()) secname = "GTA3LIMITS";
 
+    // Configurable options such as debug text key
+    for(auto& pair : ini["OPTIONS"])
+    {
+        try {
+            
+            if(!pair.first.compare("DebugTextKey"))
+                vkDebugText = std::stoi(pair.second, nullptr, 0);
+
+        } catch(const std::logic_error& ex) {
+            char buf[512];
+            sprintf(buf, "Invalid value on option %s\n%s\n", pair.first.c_str(), ex.what());
+            MessageBoxA(0, buf, "Limit Adjuster", MB_ICONERROR);
+        }
+    }
+
+    // Parse section in search of limits
     if(secname)
     {
         // Find the section we should read
@@ -141,8 +158,6 @@ void AdjustLimits(const std::map<std::string, std::string>& section)
 
 
 
-
-
 /*
  * -------- Limits Drawing on HUD --------
  */
@@ -243,11 +258,11 @@ void DrawLimit(const char* name, const char* usage)
 bool TestShouldDraw()
 {
     static bool should_draw = false;    // Should draw flag
-    static bool prevF5 = false;         // Prev state of the F5 key
-    static bool currF5 = false;         // Curr state of the F5 key
+    static bool prevF5 = false;         // Prev state of the debug text key
+    static bool currF5 = false;         // Curr state of the debug text key
 
     // Update key states and find if hot key pressed
-    currF5 = (GetKeyState(VK_F5) & 0x8000) != 0;
+    currF5 = (GetKeyState(vkDebugText) & 0x8000) != 0;
     if(currF5 && !prevF5)   // Hotkey pressed?!?
     {
         if(!should_draw)