Ped Randomizer: Allow specifying multiple models in ForcePed

Author: pongo1231

src/peds/peds.cc

@@ -10,6 +10,7 @@
 #include <common/mods.hh>
 
 #include <scrThread.hh>
+#include <Random.hh>
 
 #include "CModelInfo.hh"
 #include "Utils.hh"
@@ -80,10 +81,11 @@ class PedRandomizer
             return model;
 
         // Forced Ped
-        if (!PR::Config ().ForcedPed.empty ())
+        if (!PR::Config ().ForcedPedHashes.empty ())
             {
                 uint32_t id = CStreaming::GetModelIndex (
-                    rage::atStringHash (PR::Config ().ForcedPed));
+                    PR::Config ().ForcedPedHashes [ 0, RandomInt(PR::Config()
+                    .ForcedPedHashes.size() - 1) ]);
 
                 if (CStreaming::HasModelLoaded (id))
                     return id;
@@ -176,7 +178,6 @@ class PedRandomizer
     /*******************************************************/
     PedRandomizer ()
     {
-        std::string ForcedPed;
 #define OPTION(option) std::pair (#option, &PR::Config ().option)
 
         if (!ConfigManager::ReadConfig (
@@ -191,8 +192,33 @@ class PedRandomizer
             return;
 
         if (PR::Config ().ForcedPed.size ())
-            PR::Config ().ForcedPedHash
-                = rage::atStringHash (PR::Config ().ForcedPed);
+            {
+                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 ();
 

src/peds/peds.hh

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "peds_Compatibility.hh"
 #include "peds_Streaming.hh"
@@ -20,7 +21,7 @@ public:
         {
             std::string ForcedPed                = "";
             std::string ForcedClipset            = "";
-            uint32_t    ForcedPedHash            = -1;
+            std::vector<uint32_t> ForcedPedHashes;
             bool        EnableNSFWModels         = false;
             bool        RandomizePlayer          = true;
             bool        RandomizePeds            = true;