Fixed bugs, added features (8 JAN 22)

Fixed LightX changing light width
Added ability to change light width
Enabled Patriot to be used as a variation on cop cars

Author: ViperJohnGR

ModelVariations/LogUtil.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <iostream>
 
-#define MOD_VERSION "5.0"
+#define MOD_VERSION "5.1"
 #ifdef _DEBUG
 #define MOD_NAME "ModelVariations_d.asi"
 #else

ModelVariations/ModelVariations.cpp

@@ -48,7 +48,7 @@ std::map<short, std::vector<short>> vehPassengerGroups[9];
 std::map<short, BYTE> modelNumGroups;
 std::map<short, BYTE> pedWepVariationTypes;
 std::map<unsigned int, std::pair<void*, void*>> hookedCalls;
-std::map<int, CVector> LightPositions;
+std::map<short, std::pair<CVector, float>> LightPositions;
 
 std::vector<short> vehCurrentVariations[212];
 std::vector<short> pedCurrentVariations[300];
@@ -93,7 +93,7 @@ bool isGameModelPolice(int model)
         case 430: //Predator
         case 432: //Rhino
         case 433: //Barracks
-        case 470: //Patriot
+        //case 470: //Patriot
         case 490: //FBI Rancher
         case 496: //Police Maverick
         case 523: //HPV1000

ModelVariations/Vehicles.cpp

@@ -218,12 +218,13 @@ void readVehicleIni()
     {
         if (enableLights)
         {
+            float lightWidth = iniVeh.ReadFloat(std::to_string(i), "LightWidth", -999.0);
             float lightX = iniVeh.ReadFloat(std::to_string(i), "LightX", -999.0);
             float lightY = iniVeh.ReadFloat(std::to_string(i), "LightY", -999.0);
             float lightZ = iniVeh.ReadFloat(std::to_string(i), "LightZ", -999.0);
 
             if (lightX > -900.0 || lightY > -900.0 || lightZ > -900.0)
-                LightPositions.insert({ i, { lightX, lightY, lightZ } });
+                LightPositions.insert({ (short)i, {{ lightX, lightY, lightZ }, lightWidth} });
         }
         int numGroups = 0;
         for (int j = 0; j < 9; j++)
@@ -720,12 +721,14 @@ void __cdecl RegisterCoronaHooked(CCoronas* _this, unsigned int a2, CEntity* a3,
         auto it = LightPositions.find(lightsModel);
         if (it != LightPositions.end())
         {
-            if (it->second.x > -900.0)
-                a7->x *= it->second.x;
-            if (it->second.y > -900.0)
-                a7->y *= it->second.y;
-            if (it->second.z > -900.0)
-                a7->z *= it->second.z;
+            if (it->second.second > -900.0)
+                a7->x *= it->second.second;
+            if (it->second.first.x > -900.0)
+                a7->x += it->second.first.x;
+            if (it->second.first.y > -900.0)
+                a7->y *= it->second.first.y;
+            if (it->second.first.z > -900.0)
+                a7->z *= it->second.first.z;
         }
     }
     callOriginal<address>(_this, a2, a3, a4, a5, a6, a7, a8, a9, texture, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21);
@@ -740,12 +743,14 @@ void __cdecl AddLightHooked(char type, float x, float y, float z, float dir_x, f
         auto it = LightPositions.find(lightsModel);
         if (it != LightPositions.end())
         {
-            if (it->second.x > -900.0)
-                x *= it->second.x;
-            if (it->second.y > -900.0)
-                y *= it->second.y;
-            if (it->second.z > -900.0)
-                z *= it->second.z;
+            if (it->second.second > -900.0)
+                x *= it->second.second;
+            if (it->second.first.x > -900.0)
+                x += it->second.first.x;
+            if (it->second.first.y > -900.0)
+                y *= it->second.first.y;
+            if (it->second.first.z > -900.0)
+                z *= it->second.first.z;
         }
     }
 

ModelVariations/Vehicles.hpp

@@ -5,6 +5,7 @@
 #include "CPed.h"
 #include "CVector.h"
 
+#include <set>
 #include <vector>
 #include <unordered_set>
 
@@ -20,7 +21,7 @@ extern std::map<short, std::vector<short>> vehPassengers;
 extern std::map<short, std::vector<short>> vehDriverGroups[9];
 extern std::map<short, std::vector<short>> vehPassengerGroups[9];
 extern std::map<short, BYTE> modelNumGroups;
-extern std::map<int, CVector> LightPositions;
+extern std::map<short, std::pair<CVector, float>> LightPositions;
 
 extern std::vector<short> vehCurrentVariations[212];
 extern std::map<short, short> vehOriginalModels;