General: Code cleanup

* Restore the config macros. Now hopefully fixed with the
  Zc:preprocessor compiler option

* Use CMAKE_MSVC_RUNTIME_LIBRARY instead of replacing flags
  manually. (They didn't work before because minimum cmake level
  wasn't high enough and as such the policy that enabled the option
  wasn't active)

* Renamed rainbomizer.asi output to use the project
  name (V.Rainbomizer)

* Added Forced Vehicle config option

* Removed unused natives pattern searches

Author: Parik27

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
         nmake
         mkdir output
         mkdir output/rainbomizer
-        cp rainbomizer.asi output/V.Rainbomizer.asi
+        cp V.Rainbomizer.asi output/V.Rainbomizer.asi
         cp -r ../data output/rainbomizer/data/
         rm output/rainbomizer/data/update.sh
         rm output/rainbomizer/data/README.md

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.1.5)
-project(rainbomizer_v)
+cmake_minimum_required(VERSION 3.15)
+project(V.Rainbomizer)
 
 include(cmake/Minhook.cmake)
 
@@ -8,19 +8,9 @@ option(ENABLE_DEBUG_MENU "Enables an imgui-menu for debugging purposes")
 # C++20
 if (MSVC_VERSION GREATER_EQUAL "1900")
   set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-  # Because CMAKE_MSVC_RUNTIME_LIBRARY doesn't work for whatever reason
-  set(CompilerFlags
-    CMAKE_CXX_FLAGS
-    CMAKE_CXX_FLAGS_DEBUG
-    CMAKE_CXX_FLAGS_RELEASE
-    CMAKE_C_FLAGS
-    CMAKE_C_FLAGS_DEBUG
-    CMAKE_C_FLAGS_RELEASE
-    )
-  foreach(CompilerFlag ${CompilerFlags})
-    string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
-  endforeach()
-
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    add_compile_options(/Zc:preprocessor)
+  endif()
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
 endif()
 
@@ -41,18 +31,13 @@ file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS
   lib/*.cc
   lib/Patterns/*.cpp)
 
-add_library("rainbomizer" SHARED ${SOURCES} )
+add_library(${PROJECT_NAME} SHARED ${SOURCES} )
 
 if (ENABLE_DEBUG_MENU)
   include(cmake/DebugImgui.cmake)
 endif()
 
 # Properties
-set_target_properties("rainbomizer" PROPERTIES SUFFIX ".asi")
-target_link_libraries("rainbomizer" PUBLIC dbghelp minhook)
-target_compile_definitions("rainbomizer" PUBLIC NOMINMAX)
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-
-else()
-  target_compile_features("rainbomizer" PRIVATE cxx_auto_type)
-endif()
+set_target_properties(${PROJECT_NAME} PROPERTIES SUFFIX ".asi")
+target_link_libraries(${PROJECT_NAME} PUBLIC dbghelp minhook)
+target_compile_definitions(${PROJECT_NAME} PUBLIC NOMINMAX)

cmake/DebugImgui.cmake

@@ -3,7 +3,7 @@ include(cmake/fmt.cmake)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/debug/*.cc)
 
-target_sources("rainbomizer" PUBLIC ${SOURCES})
-target_compile_definitions("rainbomizer" PRIVATE -DENABLE_DEBUG_MENU)
-target_link_libraries ("rainbomizer" PUBLIC fmt imgui dxguid dwmapi imm32)
+target_sources(${PROJECT_NAME} PUBLIC ${SOURCES})
+target_compile_definitions(${PROJECT_NAME} PRIVATE -DENABLE_DEBUG_MENU)
+target_link_libraries (${PROJECT_NAME} PUBLIC fmt imgui dxguid dwmapi imm32)
 

cmake/DebugServer.cmake

@@ -15,13 +15,13 @@ if (TARGET example64)
     PROPERTIES EXCLUDE_FROM_ALL true)
 endif()
 
-target_sources("rainbomizer" PUBLIC ${SOURCES})
-target_compile_definitions("rainbomizer" PRIVATE -DENABLE_DEBUG_SERVER)
-target_precompile_headers("rainbomizer" PRIVATE
+target_sources(${PROJECT_NAME} PUBLIC ${SOURCES})
+target_compile_definitions(${PROJECT_NAME} PRIVATE -DENABLE_DEBUG_SERVER)
+target_precompile_headers(${PROJECT_NAME} PRIVATE
   <nlohmann/json.hpp>
   <App.h>
   )
-target_link_libraries ("rainbomizer" PUBLIC
+target_link_libraries (${PROJECT_NAME} PUBLIC
   uWebSockets
   nlohmann_json::nlohmann_json
   fmt)

lib/CStreaming.hh

@@ -82,9 +82,10 @@ public:
     GetModelIndex (uint32_t hash)
     {
         uint32_t index = -1;
-        GetModelAndIndexByHash (hash, index);
+        if (!GetModelAndIndexByHash (hash, index))
+            return -1;
 
-        return index;
+        return index & 0xFFFF;
     }
 
     static inline uint32_t

lib/Natives.cc

@@ -2,57 +2,31 @@
 #include "Utils.hh"
 #include <CTheScripts.hh>
 
-int (*__CREATE_CAR) (uint32_t hash, Vector3_native *coords, double heading,
-                     bool isNetwork, bool thisScriptCheck);
 void (*__REQUEST_MODEL) (uint32_t hash);
-void (*__LOAD_ALL_OBJECTS_NOW) ();
 unsigned short (*__GET_VEHICLE_MODEL_NUMBER_OF_SEATS) (uint32_t hash);
 
 void
 InitialiseNatives ()
 {
-    ConvertCall (
-        hook::get_pattern ("8b ec ? 83 ec 50 f3 0f 10 02 f3 0f 10 4a 08", -17),
-        __CREATE_CAR);
-
     ConvertCall (
         hook::get_pattern (
             "8b d9 0d ff ff ff 0f c7 ? ? ff ff 00 00 25 ff ff ff 0f 89", -25),
         __REQUEST_MODEL);
 
-    ConvertCall (hook::get_pattern (
-                     "? 83 ec 28 ? 8d 0d ? ? ? ? ? 33 c0 b2 01 "),
-                 __LOAD_ALL_OBJECTS_NOW);
-
     ConvertCall (
         hook::get_pattern (
             "8a 88 9d 00 00 00 80 e1 1f 80 f9 05 75 ? ? 8b 88 b0 00 00 00 ",
             -27),
         __GET_VEHICLE_MODEL_NUMBER_OF_SEATS);
 }
 
-/*******************************************************/
-int
-CREATE_CAR (uint32_t hash, Vector3_native *coords, double heading,
-            bool isNetwork, bool thisScriptCheck)
-{
-    return __CREATE_CAR (hash, coords, heading, isNetwork, thisScriptCheck);
-}
-
 /*******************************************************/
 void
 REQUEST_MODEL (uint32_t hash)
 {
     return __REQUEST_MODEL (hash);
 }
 
-/*******************************************************/
-void
-LOAD_ALL_OBJECTS_NOW ()
-{
-    return __LOAD_ALL_OBJECTS_NOW ();
-}
-
 /*******************************************************/
 unsigned short
 GET_VEHICLE_MODEL_NUMBER_OF_SEATS (uint32_t vehicleHash)

lib/rage.hh

@@ -326,15 +326,15 @@ struct atFixedArray : public atArrayBase<T[Size]>
 struct atString
 {
     char *m_szString;
-    short m_nLength;
-    short m_nCapacity;
+    unsigned short m_nLength;
+    unsigned short m_nCapacity;
 
     atString () = default;
 
     atString (const char *str)
     {
         m_szString  = const_cast<char *> (str);
-        m_nLength   = strlen (str);
+        m_nLength   = static_cast<unsigned short> (strlen (str));
         m_nCapacity = m_nLength;
     }
 };

src/colours/weather.cc

@@ -162,25 +162,10 @@ class WeatherRandomizer
     /*******************************************************/
     WeatherRandomizer ()
     {
-        if (!ConfigManager ::ReadConfig (
-                "TimecycleRandomizer",
-                std::make_pair ("RandomizeWeather",
-                                &Config ().RandomizeWeather),
-                std::make_pair ("RandomizeTimecycle",
-                                &Config ().RandomizeTimecycle),
-                std::make_pair ("RandomizeTimecycleOdds",
-                                &Config ().RandomizeTimecycleOdds),
-                std::make_pair ("RandomizeTimeOdds",
-                                &Config ().RandomizeTimeOdds),
-                std::make_pair ("RandomizeEveryFade",
-                                &Config ().RandomizeEveryFade),
-                std::make_pair ("RainOdds", &Config ().RainOdds),
-                std::make_pair ("ThunderstormOdds",
-                                &Config ().ThunderstormOdds),
-                std::make_pair ("RandomSnow", &Config ().RandomSnow),
-                std::make_pair ("SnowOdds", &Config ().SnowOdds)))
-            return;
-        ;
+        RB_C_DO_CONFIG ("TimecycleRandomizer", RandomizeWeather,
+                        RandomizeTimecycle, RandomizeTimecycleOdds,
+                        RandomizeTimeOdds, RandomizeEveryFade, RainOdds,
+                        ThunderstormOdds, RandomSnow, SnowOdds);
 
         InitialiseAllComponents ();
 

src/common/events.hh

@@ -6,7 +6,7 @@
 #include <vector>
 
 struct scrProgram;
-struct scrThreadContext;
+class scrThreadContext;
 
 namespace Rainbomizer {
 

src/sounds/voicelines.cc

@@ -418,25 +418,11 @@ class VoiceLineRandomizer
     /*******************************************************/
     VoiceLineRandomizer ()
     {
-        if (!ConfigManager ::ReadConfig (
-                "VoiceLineRandomizer",
-                std::make_pair ("IncludeDLCLines", &Config ().IncludeDLCLines),
-                std::make_pair ("TrulyRandomDuration",
-                                &Config ().TrulyRandomDuration),
-                std::make_pair ("OrderedRandomDuration",
-                                &Config ().OrderedRandomDuration),
-                std::make_pair ("SomeRandomDuration",
-                                &Config ().SomeRandomDuration),
-                std::make_pair ("NoRandomDuration",
-                                &Config ().NoRandomDuration),
-                std::make_pair ("SameSpeakerPercentage",
-                                &Config ().SameSpeakerPercentage),
-                std::make_pair ("PercentageRandomOnSomeRandom",
-                                &Config ().PercentageRandomOnSomeRandom),
-                std::make_pair ("OrderedDialogueChangeFrequency",
-                                &Config ().OrderedDialogueChangeFrequency)))
-            return;
-        ;
+        RB_C_DO_CONFIG ("VoiceLineRandomizer", IncludeDLCLines,
+                        TrulyRandomDuration, OrderedRandomDuration,
+                        SomeRandomDuration, NoRandomDuration,
+                        SameSpeakerPercentage, PercentageRandomOnSomeRandom,
+                        OrderedDialogueChangeFrequency);
 
         InitialiseAllComponents ();
         InitialiseHooks ();