Added features (10 JAN 22)

Added ini option ChangeScriptedCars
Added ability to change only parked cars

Author: ViperJohnGR

ModelVariations/LogUtil.cpp

@@ -3,10 +3,12 @@
 #include <iomanip>
 #include <fstream>
 #include <sstream>
+#include <Windows.h>
 #include <shlwapi.h>
 #include <bcrypt.h>
 #include <Psapi.h>
 
+#pragma comment (lib, "Advapi32.lib")
 #pragma comment (lib, "bcrypt.lib")
 #pragma comment (lib, "shlwapi.lib")
 
@@ -41,7 +43,7 @@ std::string hashFile(const char* filename, int& filesize)
     BCRYPT_ALG_HANDLE hProvider = NULL;
     BCRYPT_HASH_HANDLE ctx = NULL;
 
-    BCryptOpenAlgorithmProvider(&hProvider, BCRYPT_SHA256_ALGORITHM, NULL, BCRYPT_HASH_REUSABLE_FLAG);
+    BCryptOpenAlgorithmProvider(&hProvider, BCRYPT_SHA256_ALGORITHM, NULL, 0);
 
     BCryptCreateHash(hProvider, &ctx, NULL, 0, NULL, 0, 0);
     if (ctx != NULL)
@@ -93,12 +95,12 @@ std::string getParentModuleName(unsigned int address)
     return emptyString;
 }
 
-void checkCallModified(const char *callName, unsigned int originalAddress)
+void checkCallModified(const char *callName, unsigned int originalAddress, bool directAddress = false)
 {
     if (callChecks.find(*((unsigned int*)originalAddress)) != callChecks.end())
         return;
 
-    unsigned int changedAddress = getAddressFromCall((BYTE*)originalAddress);
+    unsigned int changedAddress = (directAddress == false) ? getAddressFromCall((BYTE*)originalAddress) : directAddress;
     std::string moduleName = getParentModuleName(changedAddress);
     unsigned int baseAddress = 0;
 
@@ -129,6 +131,26 @@ void checkCallModified(const char *callName, unsigned int originalAddress)
     logfile << moduleName << " 0x" << baseAddress << std::endl;
 }
 
+std::string getWindowsVersion()
+{
+    std::string retString;
+    char str[255] = {};
+    DWORD cbData = 254;
+    HKEY hkey;
+
+    if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
+    {
+        if (RegQueryValueEx(hkey, "CurrentBuild", NULL, NULL, (LPBYTE)str, &cbData) == ERROR_SUCCESS)
+        {
+            retString += "OS build ";
+            retString += str;
+        }
+        RegCloseKey(hkey);
+    }
+
+
+    return retString;
+}
 
 void checkAllCalls()
 {
@@ -192,16 +214,28 @@ void checkAllCalls()
     checkCallModified("PossiblyRemoveVehicle", 0x60C4E8);
     checkCallModified("PossiblyRemoveVehicle", 0x42CD55);
 
-    if (enableLights == 1)
+    if (changeScriptedCars == 1)
+        checkCallModified("CreateCarForScript", 0x467B01);
+
+    if (enableSpecialFeatures == 1)
     {
-        checkCallModified("RegisterCorona", 0x6ABA60);
-        checkCallModified("RegisterCorona", 0x6ABB35);
-        checkCallModified("RegisterCorona", 0x6ABC69);
+        checkCallModified("ProcessControl", 0x871148, true);
+        checkCallModified("PreRender", 0x871164, true);
     }
 
     if (enableSiren == 1)
         checkCallModified("HasCarSiren", 0x6D8492);
 
+    if (enableLights == 1 && enableSpecialFeatures == 1 && enableSiren == 1)
+    {
+        checkCallModified("RegisterCorona", 0x6ABA60);
+        checkCallModified("RegisterCorona", 0x6ABB35);
+        checkCallModified("RegisterCorona", 0x6ABC69);
+
+        checkCallModified("AddLight", 0x6AB80F);
+        checkCallModified("AddLight", 0x6ABBA6);
+    }
+
     if (disablePayAndSpray == 1)
         checkCallModified("IsCarSprayable", 0x44AC75);
 

ModelVariations/LogUtil.hpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <iostream>
 
-#define MOD_VERSION "5.1"
+#define MOD_VERSION "5.2"
 #ifdef _DEBUG
 #define MOD_NAME "ModelVariations_d.asi"
 #else
@@ -20,8 +20,11 @@ extern int enableLights;
 extern bool enableSideMissions;
 extern int enableSiren;
 extern int disablePayAndSpray;
+extern int enableSpecialFeatures;
+extern int changeScriptedCars;
 
 std::string hashFile(const char* filename, int& filesize);
 unsigned int getAddressFromCall(unsigned char* data);
-void checkCallModified(const char* callName, unsigned int originalAddress);
+void checkCallModified(const char* callName, unsigned int originalAddress, bool directAccess);
+std::string getWindowsVersion();
 void checkAllCalls();

ModelVariations/ModelVariations.cpp

@@ -52,9 +52,10 @@ std::map<short, std::pair<CVector, float>> LightPositions;
 
 std::vector<short> vehCurrentVariations[212];
 std::vector<short> pedCurrentVariations[300];
-
 std::vector<short> vehCarGenExclude;
 
+std::set<short> parkedCars;
+
 std::stack<CPed*> pedStack;
 
 BYTE dealersFixed = 0;
@@ -71,6 +72,8 @@ int loadAllVehicles = 0;
 int enableLights = 0;
 int enableSiren = 0;
 int disablePayAndSpray = 0;
+int enableSpecialFeatures = 0;
+int changeScriptedCars = 0;
 
 void(__fastcall *ProcessControlOriginal)(CAutomobile*) = NULL;
 void(__fastcall *PreRenderOriginal)(CAutomobile*) = NULL;
@@ -336,7 +339,7 @@ class ModelVariations {
                 //logfile << std::endl;
 
 
-                logfile << "Model Variations " MOD_VERSION << "\n\n\n";
+                logfile << "Model Variations " MOD_VERSION << "\n" << getWindowsVersion() << "\n\n";
 
                 char exePath[256] = {};
                 GetModuleFileName(NULL, exePath, 255);
@@ -563,22 +566,22 @@ class ModelVariations {
         {
             if (dealersFixed < 10)
                 dealersFixed++;
-            if (callsChecked < 100)
+            if (callsChecked < 1000)
                 callsChecked++;
 
-            if (callsChecked == 100 && enableLog == 1)
+            if (callsChecked == 1000 && enableLog == 1)
             {
                 checkAllCalls();
-                callsChecked = 101;
+                callsChecked = 0;
             }
 
             if (dealersFixed == 10)
             {
                 if (enableLog == 1)
-                    logfile << "Applying drug dealer fix..." << std::endl;
+                    logfile << "Applying drug dealer fix... ";
                 drugDealerFix();
                 if (enableLog == 1)
-                    logfile << std::endl;
+                    logfile << "OK" << std::endl;
                 dealersFixed = 11;
             }
         };

ModelVariations/Vehicles.cpp

@@ -5,6 +5,7 @@
 #include "../../injector/assembly.hpp"
 
 #include "CBoat.h"
+#include "CCarCtrl.h"
 #include "CCarGenerator.h"
 #include "CCoronas.h"
 #include "CGeneral.h"
@@ -83,13 +84,20 @@ int getVariationOriginalModel(int modelIndex)
     return originalModel;
 }
 
-int getRandomVariation(int modelid)
+int getRandomVariation(int modelid, bool parked = false)
 {
     if (modelid < 400 || modelid > 611)
         return modelid;
     if (vehCurrentVariations[modelid - 400].empty())
         return modelid;
 
+    if (parked == false)
+    {
+        auto it = parkedCars.find(modelid);
+        if (it != parkedCars.end())
+            return modelid;
+    }
+
     int random = CGeneral::GetRandomNumberInRange(0, vehCurrentVariations[modelid - 400].size());
     int variationModel = vehCurrentVariations[modelid - 400][random];
     if (variationModel > -1)
@@ -106,6 +114,9 @@ void readVehicleIni()
 {
     for (int i = 400; i < 612; i++)
     {
+        if (iniVeh.ReadInteger(std::to_string(i), "ChangeOnlyParked", 0) == 1)
+            parkedCars.insert(i);
+
         std::vector<short> vec = iniLineParser(VEHICLE_VARIATION, i, "Countryside", &iniVeh);
         vehVariations[i - 400][0] = vec;
         std::sort(vehVariations[i - 400][0].begin(), vehVariations[i - 400][0].end());
@@ -362,7 +373,7 @@ signed int __fastcall PickRandomCarHooked(CLoadedCarGroup* cargrp, void*, char a
 {
     if (cargrp == NULL)
         return -1;
-    return getRandomVariation(callMethodOriginalAndReturn<signed int, address>(cargrp, a2, a3));
+    return getRandomVariation(callMethodOriginalAndReturn<signed int, address>(cargrp, a2, a3), true);
 }
 
 template <unsigned int address>
@@ -380,7 +391,7 @@ void __fastcall DoInternalProcessingHooked(CCarGenerator* park) //for non-random
                     return;
                 }
 
-            park->m_nModelId = getRandomVariation(park->m_nModelId);
+            park->m_nModelId = getRandomVariation(park->m_nModelId, true);
             callMethodOriginal<address>(park);
             park->m_nModelId = model;
             return;
@@ -405,7 +416,7 @@ void __fastcall DoInternalProcessingHooked(CCarGenerator* park) //for non-random
             case 430: //Predator
             case 496: //Police Maverick
             case 488: //News Chopper
-                park->m_nModelId = getRandomVariation(park->m_nModelId);
+                park->m_nModelId = getRandomVariation(park->m_nModelId, true);
                 callMethodOriginal<address>(park);
                 park->m_nModelId = model;
                 break;
@@ -775,6 +786,12 @@ void __cdecl PossiblyRemoveVehicleHooked(CVehicle* car)
 
 }
 
+template <unsigned int address>
+CVehicle* __cdecl CreateCarForScriptHooked(int modelId, float posX, float posY, float posZ, char doMissionCleanup)
+{
+    return callOriginalAndReturn<CVehicle*, address>(getRandomVariation(modelId), posX, posY, posZ, doMissionCleanup);
+}
+
 /*
 0x053A926
 void __declspec(naked) ()
@@ -1036,8 +1053,7 @@ void __fastcall CAutomobileRenderHooked(CAutomobile* veh)
 void installVehicleHooks()
 {
     if (enableLog == 1)
-        logfile << "Installing vehicle hooks..." << std::endl;
-
+        logfile << "Installing vehicle hooks... ";
 
     hookCall(0x43022A, ChooseModelHooked<0x43022A>); //CCarCtrl::GenerateOneRandomCar
    //patch::RedirectJump(0x424E20, ChoosePoliceCarModelHooked);
@@ -1104,18 +1120,10 @@ void installVehicleHooks()
     hookCall(0x60C4E8, PossiblyRemoveVehicleHooked<0x60C4E8>); //CPlayerPed::KeepAreaAroundPlayerClear
     hookCall(0x42CD55, PossiblyRemoveVehicleHooked<0x42CD55>); //CCarCtrl::RemoveDistantCars
 
+    if (changeScriptedCars = iniVeh.ReadInteger("Settings", "ChangeScriptedCars", 0))
+        hookCall(0x467B01, CreateCarForScriptHooked<0x467B01>);
 
-    if (enableLights == 1)
-    {
-        hookCall(0x6ABA60, RegisterCoronaHooked<0x6ABA60>); //CAutomobile::PreRender
-        hookCall(0x6ABB35, RegisterCoronaHooked<0x6ABB35>); //CAutomobile::PreRender
-        hookCall(0x6ABC69, RegisterCoronaHooked<0x6ABC69>); //CAutomobile::PreRender
-
-        hookCall(0x6AB80F, AddLightHooked<0x6AB80F>); //CAutomobile::PreRender
-        hookCall(0x6ABBA6, AddLightHooked<0x6ABBA6>); //CAutomobile::PreRender
-    }
-
-    if (iniVeh.ReadInteger("Settings", "EnableSpecialFeatures", 0))
+    if (enableSpecialFeatures = iniVeh.ReadInteger("Settings", "EnableSpecialFeatures", 0))
     {
         void(__fastcall **p)(CAutomobile*) = reinterpret_cast<void(__fastcall**)(CAutomobile*)>(0x871148);
         ProcessControlOriginal = *p;
@@ -1161,6 +1169,16 @@ void installVehicleHooks()
     if ((enableSiren = iniVeh.ReadInteger("Settings", "EnableSiren", 0)) == 1)
         patch::RedirectCall(0x6D8492, HasCarSiren); //CVehicle::UsesSiren
 
+    if (enableLights == 1 && enableSpecialFeatures == 1 && enableSiren == 1)
+    {
+        hookCall(0x6ABA60, RegisterCoronaHooked<0x6ABA60>); //CAutomobile::PreRender
+        hookCall(0x6ABB35, RegisterCoronaHooked<0x6ABB35>); //CAutomobile::PreRender
+        hookCall(0x6ABC69, RegisterCoronaHooked<0x6ABC69>); //CAutomobile::PreRender
+
+        hookCall(0x6AB80F, AddLightHooked<0x6AB80F>); //CAutomobile::PreRender
+        hookCall(0x6ABBA6, AddLightHooked<0x6ABBA6>); //CAutomobile::PreRender
+    }
+
     if ((disablePayAndSpray = iniVeh.ReadInteger("Settings", "DisablePayAndSpray", 0)) == 1)
         hookCall(0x44AC75, IsCarSprayableHooked<0x44AC75>); //CGarage::Update
 
@@ -1170,4 +1188,7 @@ void installVehicleHooks()
         hookCall(0x48DA81, IsLawEnforcementVehicleHooked<0x48DA81>);
         hookCall(0x469612, CollectParametersHooked<0x469612>);
     }
+
+    if (enableLog == 1)
+        logfile << "OK" << std::endl;
 }

ModelVariations/Vehicles.hpp

@@ -16,6 +16,7 @@ extern std::ofstream logfile;
 
 extern std::array<std::vector<short>, 16> vehVariations[212];
 extern std::array<std::vector<short>, 16> vehWantedVariations[212];
+extern std::map<short, short> vehOriginalModels;
 extern std::map<short, std::vector<short>> vehDrivers;
 extern std::map<short, std::vector<short>> vehPassengers;
 extern std::map<short, std::vector<short>> vehDriverGroups[9];
@@ -24,15 +25,19 @@ extern std::map<short, BYTE> modelNumGroups;
 extern std::map<short, std::pair<CVector, float>> LightPositions;
 
 extern std::vector<short> vehCurrentVariations[212];
-extern std::map<short, short> vehOriginalModels;
 extern std::vector<short> vehCarGenExclude;
+
+extern std::set<short> parkedCars;
+
 extern int loadAllVehicles;
 
 extern int enableLog;
 extern int changeCarGenerators;
 extern bool enableSideMissions;
 extern int enableAllSideMissions;
 extern int enableLights;
+extern int enableSpecialFeatures;
+extern int changeScriptedCars;
 
 extern void(__fastcall *ProcessControlOriginal)(CAutomobile*);
 extern void(__fastcall *PreRenderOriginal)(CAutomobile*);