Skip to content

Ped Randomizer: Allow specifying multiple models in ForcePed #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ped Randomizer: Allow specifying multiple models in ForcePed #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c5c0ae
Ped Randomizer: Allow specifying multiple models in ForcePed
Feb 17, 2022
4cdfe0e
Ped Randomizer: Add compatibility for changing ForcePed in debug menu
Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/peds/peds.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <common/mods.hh>

#include <scrThread.hh>
#include <Random.hh>

#include "CModelInfo.hh"
#include "Utils.hh"
Expand Down Expand Up @@ -80,10 +81,12 @@ class PedRandomizer
return model;

// Forced Ped
if (!PR::Config ().ForcedPed.empty ())
PR::Config ().ForcedPedHashes = PR::Config ().ForcedPed;
if (!PR::Config ().ForcedPedHashes.Get ().empty ())
{
uint32_t id = CStreaming::GetModelIndex (
rage::atStringHash (PR::Config ().ForcedPed));
PR::Config ().ForcedPedHashes.Get ()[ 0, RandomInt(PR::Config()
.ForcedPedHashes.Get ().size () - 1) ]);

if (CStreaming::HasModelLoaded (id))
return id;
Expand Down Expand Up @@ -176,7 +179,6 @@ class PedRandomizer
/*******************************************************/
PedRandomizer ()
{
std::string ForcedPed;
#define OPTION(option) std::pair (#option, &PR::Config ().option)

if (!ConfigManager::ReadConfig (
Expand All @@ -190,10 +192,6 @@ class PedRandomizer
OPTION (OddsOfPlayerModels)))
return;

if (PR::Config ().ForcedPed.size ())
PR::Config ().ForcedPedHash
= rage::atStringHash (PR::Config ().ForcedPed);

InitialiseAllComponents ();

// Hooks
Expand Down
70 changes: 69 additions & 1 deletion src/peds/peds.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <string>
#include <vector>

#include "peds_Compatibility.hh"
#include "peds_Streaming.hh"
Expand All @@ -10,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);
}
}
}

/*******************************************************/
const std::vector<uint32_t> &
Get () const
{
return m_ForcedPedHashes;
}
};

class PedRandomizer_Components
{
public:
Expand All @@ -20,7 +88,7 @@ public:
{
std::string ForcedPed = "";
std::string ForcedClipset = "";
uint32_t ForcedPedHash = -1;
PedRandomizer_PedHashes ForcedPedHashes;
bool EnableNSFWModels = false;
bool RandomizePlayer = true;
bool RandomizePeds = true;
Expand Down