Subsitute Config Macros because they don't work with MSVC

Author: Parik27

src/colours/colours.cc

@@ -127,8 +127,14 @@ class ColoursRandomizer
     /*******************************************************/
     ColoursRandomizer ()
     {
-        RB_C_DO_CONFIG ("ColourRandomizer", RandomizeHudColours,
-                        RandomizeCarColours);
+        if (!ConfigManager ::ReadConfig (
+                "ColourRandomizer",
+                std::make_pair ("RandomizeHudColours",
+                                &Config ().RandomizeHudColours),
+                std::make_pair ("RandomizeCarColours",
+                                &Config ().RandomizeCarColours)))
+            return;
+        ;
 
         InitialiseAllComponents ();
 

src/colours/lights.cc

@@ -136,7 +136,13 @@ class LightsRandomizer
     /*******************************************************/
     LightsRandomizer ()
     {
-        RB_C_DO_CONFIG ("LightRandomizer", LightShiftFrequency, RandomizeOdds);
+        if (!ConfigManager ::ReadConfig (
+                "LightRandomizer",
+                std::make_pair ("LightShiftFrequency",
+                                &Config ().LightShiftFrequency),
+                std::make_pair ("RandomizeOdds", &Config ().RandomizeOdds)))
+            return;
+        ;
 
         InitialiseAllComponents ();
 

src/colours/weather.cc

@@ -162,10 +162,25 @@ class WeatherRandomizer
     /*******************************************************/
     WeatherRandomizer ()
     {
-        RB_C_DO_CONFIG ("TimecycleRandomizer", RandomizeWeather,
-                        RandomizeTimecycle, RandomizeTimecycleOdds,
-                        RandomizeTimeOdds, RandomizeEveryFade, RainOdds,
-                        ThunderstormOdds, RandomSnow, SnowOdds);
+        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;
+        ;
 
         InitialiseAllComponents ();
 

src/misc/scaleform.cc

@@ -142,7 +142,11 @@ class ScaleformRandomizer
     /*******************************************************/
     ScaleformRandomizer ()
     {
-        RB_C_DO_CONFIG ("ScaleformRandomizer", FailMessageOdds);
+        if (!ConfigManager ::ReadConfig (
+                "ScaleformRandomizer",
+                std::make_pair ("FailMessageOdds", &Config ().FailMessageOdds)))
+            return;
+        ;
 
         InitialiseAllComponents ();
         REGISTER_HOOK ("89 74 ? ? e8 ? ? ? ? ? 8b cd ? 8b d0 e8", 4,

src/mission/missions.cc

@@ -81,8 +81,15 @@ class MissionRandomizer
     /*******************************************************/
     MissionRandomizer ()
     {
-        RB_C_DO_CONFIG ("MissionRandomizer", Seed, ForceSeedOnSaves,
-                        ForcedMission, EnableFastSkips, LogMissionOrder);
+        if (!ConfigManager ::ReadConfig (
+                "MissionRandomizer", std ::make_pair ("Seed", &Config ().Seed),
+                std::make_pair ("ForceSeedOnSaves",
+                                &Config ().ForceSeedOnSaves),
+                std::make_pair ("ForcedMission", &Config ().ForcedMission),
+                std::make_pair ("EnableFastSkips", &Config ().EnableFastSkips),
+                std::make_pair ("LogMissionOrder", &Config ().LogMissionOrder)))
+            return;
+        ;
 
         InitialiseAllComponents ();
 

src/sounds/voicelines.cc

@@ -386,11 +386,23 @@ class VoiceLineRandomizer
     /*******************************************************/
     VoiceLineRandomizer ()
     {
-        RB_C_DO_CONFIG ("VoiceLineRandomizer", IncludeDLCLines,
-                        TrulyRandomDuration, OrderedRandomDuration,
-                        SomeRandomDuration, NoRandomDuration,
-                        PercentageRandomOnSomeRandom,
-                        OrderedDialogueChangeFrequency);
+        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 ("PercentageRandomOnSomeRandom",
+                                &Config ().PercentageRandomOnSomeRandom),
+                std::make_pair ("OrderedDialogueChangeFrequency",
+                                &Config ().OrderedDialogueChangeFrequency)))
+            return;
+        ;
 
         InitialiseAllComponents ();
         InitialiseHooks ();