Ped Randomizer: Add compatibility for changing ForcePed in debug menu

Author: pongo1231

src/peds/peds.cc

@@ -81,11 +81,12 @@ class PedRandomizer
             return model;
 
         // Forced Ped
-        if (!PR::Config ().ForcedPedHashes.empty ())
+        PR::Config ().ForcedPedHashes = PR::Config ().ForcedPed;
+        if (!PR::Config ().ForcedPedHashes.Get ().empty ())
             {
                 uint32_t id = CStreaming::GetModelIndex (
-                    PR::Config ().ForcedPedHashes [ 0, RandomInt(PR::Config()
-                    .ForcedPedHashes.size() - 1) ]);
+                    PR::Config ().ForcedPedHashes.Get ()[ 0, RandomInt(PR::Config()
+                    .ForcedPedHashes.Get ().size () - 1) ]);
 
                 if (CStreaming::HasModelLoaded (id))
                     return id;
@@ -191,35 +192,6 @@ class PedRandomizer
                 OPTION (OddsOfPlayerModels)))
             return;
 
-        if (PR::Config ().ForcedPed.size ())
-            {
-                std::string forcedPeds = PR::Config ().ForcedPed;
-
-                while (true)
-                    {
-                        size_t splitPos = forcedPeds.find (',');
-
-                        std::string forcedPed = forcedPeds.substr (0, splitPos);
-
-                        // trimming
-                        forcedPed.erase (0, forcedPed.find_first_not_of (' '));
-                        if (forcedPed.find_last_not_of (' ') != forcedPed.npos)
-                            forcedPed.erase (forcedPed.find_last_not_of (' ') + 1);
-                        
-                        // just in case it was just whitespace
-                        if (forcedPed.size ())
-                            PR::Config ().ForcedPedHashes
-                                .push_back (rage::atStringHash (forcedPed));
-                        
-                        if (splitPos == forcedPeds.npos)
-                            {
-                                break;
-                            }
-                        
-                        forcedPeds.erase (0, splitPos + 1);
-                    }
-            }
-
         InitialiseAllComponents ();
 
         // Hooks

src/peds/peds.hh

@@ -11,6 +11,73 @@
 #include "peds_AnimalFixes.hh"
 #include "peds_MainFixes.hh"
 
+class PedRandomizer_PedHashes
+{
+    std::string m_ForcedPedStr;
+    std::vector<uint32_t> m_ForcedPedHashes;
+
+public:
+    /*******************************************************/
+    PedRandomizer_PedHashes () = default;
+
+    /*******************************************************/
+    PedRandomizer_PedHashes (const std::string &forcedPedStr)
+        : m_ForcedPedStr (forcedPedStr)
+    {
+        UpdateHashes (forcedPedStr);
+    }
+
+    /*******************************************************/
+    void
+    operator= (const std::string &forcedPedStr)
+    {
+        if (m_ForcedPedStr != forcedPedStr)
+        {
+            m_ForcedPedStr = forcedPedStr;
+            UpdateHashes (forcedPedStr);
+        }
+    }
+
+    /*******************************************************/
+    void
+    UpdateHashes(std::string forcedPedStr)
+    {
+        m_ForcedPedHashes.clear ();
+
+        if (forcedPedStr.size ())
+            {
+                while (true)
+                    {
+                        auto splitPos = forcedPedStr.find (',');
+                        auto forcedPed = std::string (forcedPedStr.substr (0, splitPos));
+
+                        // trimming
+                        forcedPed.erase (0, forcedPed.find_first_not_of (' '));
+                        if (forcedPed.find_last_not_of (' ') != forcedPed.npos)
+                            forcedPed.erase (forcedPed.find_last_not_of (' ') + 1);
+                        
+                        if (forcedPed.size ())
+                            m_ForcedPedHashes
+                                .push_back (rage::atStringHash (forcedPed));
+                        
+                        if (splitPos == forcedPedStr.npos)
+                            {
+                                break;
+                            }
+                        
+                        forcedPedStr.erase (0, splitPos + 1);
+                    }
+            }
+    }
+
+    /*******************************************************/
+    std::vector<uint32_t> &
+    Get()
+    {
+        return m_ForcedPedHashes;
+    }
+};
+
 class PedRandomizer_Components
 {
 public:
@@ -21,7 +88,7 @@ public:
         {
             std::string ForcedPed                = "";
             std::string ForcedClipset            = "";
-            std::vector<uint32_t> ForcedPedHashes;
+            PedRandomizer_PedHashes ForcedPedHashes;
             bool        EnableNSFWModels         = false;
             bool        RandomizePlayer          = true;
             bool        RandomizePeds            = true;