Traffic Randomizer: Fix No Traffic + No Dispatch Heli

Parik27 · Apr 23, 2021 · 5a0c61c · 5a0c61c
1 parent 6c32a66
commit 5a0c61c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/build-count.txt b/build-count.txt
@@ -1 +1 @@
-312
+314
diff --git a/data/FailMessages.txt b/data/FailMessages.txt
@@ -28,3 +28,9 @@ Always letting the homies down, eh?
 Absolute garbage.
 Absolutely terrible performance.
 I'm sorry to inform you that
+There goes my burrito!
+Why did I move here?
+Alt+F4 for free shark cards.
+We'll get 'em next time.
+WHAAAAAAAAAAAAAAAAAAAAAAAAAT!
+NO!
diff --git a/src/mission/peds.cc b/src/mission/peds.cc
@@ -99,9 +99,6 @@ class PedRandomizer
             SWAP_FIELD (GetInitInfo ().m_nRelationshipGroup);
             SWAP_FIELD (GetInitInfo ().m_nDecisionMakerName);
             SWAP_FIELD (GetInitInfo ().m_nNavCapabilitiesName);
-            SWAP_FIELD (GetInitInfo ().m_nMotionTaskDataSetName);
-            SWAP_FIELD (GetInitInfo ().m_nDefaultTaskDataSetName);
-            SWAP_FIELD (m_nMovementClipSet);
 
 #undef SWAP_FIELD
         }

diff --git a/src/vehicles/dispatch.cc b/src/vehicles/dispatch.cc
@@ -46,25 +46,15 @@ class DispatchRandomizer
     static uint32_t
     GetRandomPoliceHelicopter ()
     {
-        static std::vector<uint32_t> m_HeliHashes;
+        auto vehs = VehicleRandomizerHelper::GetLoadedVehSet ();
 
-        if (!m_HeliHashes.size ())
-            {
-                auto &hashes = Rainbomizer::Common::GetVehicleHashes ();
-                for (auto hash : hashes)
-                    {
-                        CVehicleModelInfo *model
-                            = CStreaming::GetModelByHash<CVehicleModelInfo> (
-                                hash);
-
-                        if (model->GetVehicleType ()
-                            != "VEHICLE_TYPE_HELI"_joaat)
-                            m_HeliHashes.push_back (
-                                CStreaming::GetModelIndex (hash));
-                    }
-            }
+        VehicleRandomizerHelper::RemoveOtherVehicleTypesFromSet<
+            "VEHICLE_TYPE_HELI"_joaat> (vehs);
 
-        return CStreaming::GetModelIndex (GetRandomElement (m_HeliHashes));
+        if (vehs.size ())
+            return GetRandomElement (vehs);
+
+        return ~0;
     }
 
     /*******************************************************/
@@ -130,7 +120,7 @@ class DispatchRandomizer
         bool ret = CDispatchService_GetVehicleSetModels98c (service, outVeh,
                                                             outPed, outObj, p5);
 
-        //StoreVehicleIndex (GetVehicleForDispatchService (service), outVeh);
+        StoreVehicleIndex (GetVehicleForDispatchService (service), outVeh);
         return ret;
     }
 

diff --git a/src/vehicles/vehicle_common.hh b/src/vehicles/vehicle_common.hh
@@ -18,7 +18,7 @@ public:
     inline static bool
     IsVehicleAnyOfType (uint32_t idx)
     {
-        bool     ret     = true;
+        bool     ret     = false;
         uint32_t vehType = CStreaming::GetModelByIndex<CVehicleModelInfo> (idx)
                                ->GetVehicleType ();
         (..., (ret = vehType == Hashes ? true : ret));