Minor improvements

Author: ViperJohnGR

ModelVariations/Hooks.hpp

@@ -67,15 +67,15 @@ inline void hookCall(std::uintptr_t address, void* pFunction, std::string name,
 }
 
 template <std::uintptr_t address, typename... Args>
-inline void callOriginal(Args... args)
+void callOriginal(Args... args)
 {
     auto it = hookedCalls.find(address);
     if (it != hookedCalls.end())
         reinterpret_cast<void(__cdecl*)(Args...)>(it->second.originalFunction)(args...);
 }
 
 template <typename Ret, std::uintptr_t address, typename... Args>
-inline Ret callOriginalAndReturn(Args... args)
+Ret callOriginalAndReturn(Args... args)
 {
     auto it = hookedCalls.find(address);
     if (it != hookedCalls.end())
@@ -86,15 +86,15 @@ inline Ret callOriginalAndReturn(Args... args)
 
 
 template <std::uintptr_t address, typename C, typename... Args>
-inline void callMethodOriginal(C _this, Args... args)
+void callMethodOriginal(C _this, Args... args)
 {
     auto it = hookedCalls.find(address);
     if (it != hookedCalls.end())
         reinterpret_cast<void(__thiscall*)(C, Args...)>(it->second.originalFunction)(_this, args...);
 }
 
 template <typename Ret, std::uintptr_t address, typename C, typename... Args>
-inline Ret callMethodOriginalAndReturn(C _this, Args... args)
+Ret callMethodOriginalAndReturn(C _this, Args... args)
 {
     auto it = hookedCalls.find(address);
     if (it != hookedCalls.end())
@@ -105,7 +105,7 @@ inline Ret callMethodOriginalAndReturn(C _this, Args... args)
 
 
 template <std::uintptr_t at, std::uintptr_t len = 5, class FuncT>
-inline void MakeInline(const char *funcName, const char* originalData, FuncT func)
+void MakeInline(const char *funcName, const char* originalData, FuncT func)
 {
     if (forceEnable || memcmp(at, originalData))
         injector::MakeInline<at, at+len>(func);

ModelVariations/ModelVariations.cpp

@@ -202,24 +202,23 @@ std::string getDatetime(bool printDate, bool printTime, bool printMs)
     SYSTEMTIME systime;
     GetSystemTime(&systime);
     std::stringstream ss;
-    std::string ms;
-
-    if (printMs)
-        ms += "." + std::to_string(systime.wMilliseconds);
 
     if (printDate)
     {
         ss << systime.wDay << "/" << systime.wMonth << "/" << systime.wYear;
 
-        if (!printTime)
-            return ss.str();
-
-        ss << " ";
+        if (printTime)
+            ss << " ";
     }
 
-    ss << std::setfill('0') << std::setw(2) << systime.wHour << ":"
-       << std::setfill('0') << std::setw(2) << systime.wMinute << ":"
-       << std::setfill('0') << std::setw(2) << systime.wSecond << ms;
+    if (printTime)
+    {
+        ss << std::setfill('0') << std::setw(2) << systime.wHour << ":"
+            << std::setfill('0') << std::setw(2) << systime.wMinute << ":"
+            << std::setfill('0') << std::setw(2) << systime.wSecond;
+        if (printMs)
+            ss << "." << std::setfill('0') << std::setw(3) << systime.wMilliseconds;
+    }
 
     return ss.str();
 }
@@ -235,7 +234,7 @@ bool LoadPESection(const char* filePath, int section, std::vector<unsigned char>
 
     auto functionError = [&](const char* msg, int errorType)
     {
-        std::cerr << msg << std::endl;
+        Log::Write("Error logging jumps. %s.\n", msg);
         switch (errorType)
         {
             case 3:
@@ -250,11 +249,8 @@ bool LoadPESection(const char* filePath, int section, std::vector<unsigned char>
     };
 
     hFile = CreateFileA(filePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hFile == INVALID_HANDLE_VALUE) 
-    {
-        std::cerr << "Failed to open file" << std::endl;
-        return false;
-    }
+    if (hFile == INVALID_HANDLE_VALUE)
+        return functionError("Failed to open file", 0);
 
     // Create a file mapping
     hFileMapping = CreateFileMapping(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
@@ -853,6 +849,9 @@ class ModelVariations {
             {
                 for (auto &it : hookedCalls)
                 {
+                    if (it.second.name.empty())
+                        continue;
+
                     const std::uintptr_t functionAddress = (it.second.isVTableAddress == false) ? injector::GetBranchDestination(it.first).as_int() : *reinterpret_cast<unsigned int*>(it.first);
                     std::pair<std::string, MODULEINFO> moduleInfo = LoadedModules::GetModuleAtAddress(functionAddress);
                     std::string moduleName = moduleInfo.first.substr(moduleInfo.first.find_last_of("/\\") + 1);

ModelVariations/PedWeapons.cpp

@@ -310,8 +310,8 @@ int16_t __fastcall CollectParametersHooked(CRunningScript * _this, void*, unsign
 
 void PedWeaponVariations::InstallHooks()
 {
-    hookCall(0x62A12E, GiveWeaponAtStartOfFightHooked<0x62A12E>, "CPed::GiveWeaponAtStartOfFight");
-    hookCall(0x47D335, GiveWeaponHooked<0x47D335>, "CPed::GiveWeapon");
-    hookCall(0x47D4AC, CollectParametersHooked<0x47D4AC>, "CRunningScript::CollectParameters"); //SET_CURRENT_CHAR_WEAPON
-    hookCall(0x48AE9E, CollectParametersHooked<0x48AE9E>, "CRunningScript::CollectParameters"); //HAS_CHAR_GOT_WEAPON
+    hookCall(0x62A12E, GiveWeaponAtStartOfFightHooked<0x62A12E>, "CPed::GiveWeaponAtStartOfFight"); //CTaskSimpleFightingControl::ProcessPed
+    hookCall(0x47D335, GiveWeaponHooked<0x47D335>, "CPed::GiveWeapon"); //01B2: GIVE_WEAPON_TO_CHAR
+    hookCall(0x47D4AC, CollectParametersHooked<0x47D4AC>, "CRunningScript::CollectParameters"); //01B9: SET_CURRENT_CHAR_WEAPON
+    hookCall(0x48AE9E, CollectParametersHooked<0x48AE9E>, "CRunningScript::CollectParameters"); //0491: HAS_CHAR_GOT_WEAPON
 }