Car Generator Randomizer: Exempt Gauntlets

Author: Parik27

src/misc/ramps.cc

@@ -36,9 +36,9 @@ class RampRandomizer
             if ("DOES_ENTITY_EXIST"_n(ObjectHandle))
                 return;
 
-            if (!CStreaming::HasModelLoaded (Model))
+            if (!CStreaming::HasModelLoaded (modelIdx))
                 {
-                    CStreaming::RequestModel (Model, 0);
+                    CStreaming::RequestModel (modelIdx, 0);
                     CStreaming::LoadAllObjects (false);
                 }
 

src/mission/missions_Cmds.cc

@@ -298,6 +298,7 @@ MissionRandomizer_Commands::OnMissionStart (uint32_t origHash,
         case "finalea"_joaat:
             "GIVE_WEAPON_TO_PED"_n("PLAYER_PED_ID"_n(), "weapon_pistol"_joaat,
                                    25, 1, 1);
+            break;
 
         case "family3"_joaat: SetBuildingState (2, 0); break;
         }

src/vehicles/cargens.cc

@@ -34,6 +34,13 @@ class CarGeneratorRandomizer
         return GetRandomElement (Rainbomizer::Common::GetVehicleHashes ());
     }
 
+    /*******************************************************/
+    static bool
+    ShouldRandomize (uint32_t modelHash)
+    {
+        return modelHash != "gauntlet"_joaat;
+    }
+    
     /*******************************************************/
     template <auto &CCarGen__Init>
     static void
@@ -55,7 +62,7 @@ class CarGeneratorRandomizer
             p20, p21, p22);
 #endif
 
-        if (Config().Enable)
+        if (Config().Enable && ShouldRandomize (modelHash))
             {
                 *vehicleGroup = 0;