Ped Randomizer: Randomize Ambient Model Sets for more variety

Parik27 · Jul 29, 2021 · 78a4f66 · 78a4f66
1 parent dd049f1
commit 78a4f66
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 5 deletions.
diff --git a/build-count.txt b/build-count.txt
@@ -1 +1 @@
-470
+471
diff --git a/lib/CAmbientModelSets.cc b/lib/CAmbientModelSets.cc
@@ -0,0 +1,9 @@
+#include "CAmbientModelSets.hh"
+#include "Utils.hh"
+
+void
+CAmbientModelSetsManager::InitialisePatterns ()
+{
+    sm_Instance = GetRelativeReference<CAmbientModelSetsManager *> (
+        "? 8b 0d ? ? ? ? ? 8b c3 8b d0 e8 ? ? ? ?", 3, 7);
+}
diff --git a/lib/CAmbientModelSets.hh b/lib/CAmbientModelSets.hh
@@ -0,0 +1,51 @@
+#pragma once
+
+#include <cstdint>
+#include <rage.hh>
+
+enum AmbientModelSetType
+{
+    AMBIENT_PED_MODEL_SET = 0,
+    AMBIENT_PROP_MODEL_SET,
+    AMBIENT_VEHICLE_MODEL_SET
+};
+
+struct CAmbientModel
+{
+    uint32_t Name;
+    uint32_t field_0x4;
+    void *   Variations;
+    float    Probability;
+    uint32_t field_0x14;
+};
+
+struct CAmbientModelSet
+{
+    void *                        vft;
+    uint32_t                      Name;
+    uint32_t                      field_0xc;
+    struct atArray<CAmbientModel> Models;
+    uint32_t                      field_0x1c;
+};
+
+struct CAmbientModelSets
+{
+    atArray<CAmbientModelSet *> ModelSets;
+    uint8_t                     field_0xc[28];
+};
+
+struct CAmbientModelSetsManager
+{
+    uint8_t                  field_0x0[16];
+    struct CAmbientModelSets aSets[3];
+
+    inline static CAmbientModelSetsManager **sm_Instance;
+
+    static CAmbientModelSetsManager *
+    Get ()
+    {
+        return *sm_Instance;
+    }
+
+    static void InitialisePatterns ();
+};
diff --git a/lib/Utils.cc b/lib/Utils.cc
@@ -21,6 +21,7 @@
 #include "CTask.hh"
 #include "CModelIndices.hh"
 #include "CCredits.hh"
+#include "CAmbientModelSets.hh"
 
 #include "Utils.hh"
 
@@ -133,6 +134,7 @@ InitialiseAllComponents ()
     aiTask::InitialisePatterns ();
     CModelIndices::InitialisePatterns ();
     CCreditArray::InitialisePatterns ();
+    CAmbientModelSetsManager::InitialisePatterns ();
 
 #ifndef NO_PARSER_UTILS
     ParserUtils::Register ();

diff --git a/src/mission/missions_PlayerSwitch.cc b/src/mission/missions_PlayerSwitch.cc
@@ -246,7 +246,7 @@ MissionRandomizer_PlayerSwitcher::CheckCurrentPlayer (ePlayerIndex index)
         == int (eCharacter::_))
         {
             uint32_t hash     = 0;
-            auto *playerModel = PedRandomizerCompatibility::GetOriginalModel (
+            auto *playerModel = PedRandomizer_Compatibility::GetOriginalModel (
                 CPedFactory::Get ()->pPlayer);
 
             switch (index)

diff --git a/src/peds/peds_AnimalFixes.hh b/src/peds/peds_AnimalFixes.hh
@@ -25,7 +25,7 @@ class PedRandomizer_AnimalFixes
     static aiTask *FixFallingPeds (CPed *_this, CPed *ped,
                                    bool *spawningPreference);
 
-    void FixLadderClimbAsAnimal ();
+    static void FixLadderClimbAsAnimal ();
 
 public:
     static void Initialise ();

diff --git a/src/peds/peds_PlayerFixes.hh b/src/peds/peds_PlayerFixes.hh
@@ -63,7 +63,7 @@ class PedRandomizer_PlayerFixes
     CorrectPlayerObjIdx (CutSceneManager *mgr)
     {
         CPed *          player = CPedFactory::Get ()->pPlayer;
-        CBaseModelInfo *model  = PedRandomizerCompatibility::GetOriginalModel (
+        CBaseModelInfo *model  = PedRandomizer_Compatibility::GetOriginalModel (
             CPedFactory::Get ()->pPlayer);
 
         // Restore original model for this function and change it back after
@@ -179,7 +179,7 @@ class PedRandomizer_PlayerFixes
     {
         CPlayerPedSaveStructure__PreSave (save);
 
-        uint32_t origHash = PedRandomizerCompatibility::GetOriginalModel (
+        uint32_t origHash = PedRandomizer_Compatibility::GetOriginalModel (
                                 CPedFactory::Get ()->pPlayer)
                                 ->m_nHash;
 

diff --git a/src/peds/peds_Streaming.hh b/src/peds/peds_Streaming.hh
@@ -11,6 +11,7 @@
 
 #include <rage.hh>
 #include <CPopulation.hh>
+#include <CAmbientModelSets.hh>
 
 #include <ctime>
 
@@ -125,12 +126,23 @@ class PedRandomizer_Streaming
     RandomizePedGroups (CPopGroupList *grps, uint32_t name, uint32_t *out)
     {
         auto &PedHashes = Rainbomizer::Common::GetPedHashes ();
+
+        // Pop Groups
         for (auto &grp : grps->pedGroups)
             {
                 for (auto &model : grp.models)
                     model.Name = GetRandomElement (PedHashes);
             }
 
+        // Ambient Model Sets (used for Scenarios)
+        for (auto &models : CAmbientModelSetsManager::Get ()
+                                ->aSets[AMBIENT_PED_MODEL_SET]
+                                .ModelSets)
+            {
+                for (auto &model : models->Models)
+                    model.Name = GetRandomElement (PedHashes);
+            }
+
         return CPopGroupList__GetVehGroup (grps, name, out);
     }