jonny_bro/SilentPatch
1
0
Fork 0
mirror of https://github.com/CookiePLMonster/SilentPatch.git synced 2025-01-31 06:57:28 +05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-init text IPL pickups, car generators and stunt jumps on New Game

Browse source 
Fixes an issue where fire extinguisher and a few other pickups
didn't show on New Game if it was started from a save
This commit is contained in:
Silent 2024-02-03 22:59:27 +01:00
parent ef65dd7c2d
commit eb8cfe933a
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
SilentPatchSA/SilentPatchSA.cpp
View file

@ -1493,6 +1493,7 @@ namespace VariableResets
using VarVariant = std::variant< bool*, int*, TimeNextMadDriverChaseCreated_t<float>*, ResetToTrue_t* >; using VarVariant = std::variant< bool*, int*, TimeNextMadDriverChaseCreated_t<float>*, ResetToTrue_t* >;
std::vector<VarVariant> GameVariablesToReset; std::vector<VarVariant> GameVariablesToReset;
std::vector<std::string> PickupDefs, CarGeneratorDefs, StuntJumpDefs;
static void ReInitOurVariables() static void ReInitOurVariables()
{ {
@ -1504,6 +1505,54 @@ namespace VariableResets
} }
} }
static std::string_view TrimWhitespace(std::string_view line)
{
const size_t first = line.find_first_not_of(' ');
if (std::string_view::npos != first)
{
const size_t last = line.find_last_not_of(' ');
line = line.substr(first, (last - first + 1));
}
return line;
}
static void (*orgLoadPickup)(const char* line);
static void LoadPickup_SaveLine(const char* line)
{
orgLoadPickup(line);
PickupDefs.emplace_back(TrimWhitespace(line));
}
static void (*orgLoadCarGenerator)(const char* line, int originScene);
static void LoadCarGenerator_SaveLine(const char* line, int originScene)
{
orgLoadCarGenerator(line, originScene);
CarGeneratorDefs.emplace_back(TrimWhitespace(line));
}
static void (*orgLoadStuntJump)(const char* line);
static void LoadStuntJump_SaveLine(const char* line)
{
orgLoadStuntJump(line);
StuntJumpDefs.emplace_back(TrimWhitespace(line));
}
static void ReloadObjectDefinitionsAfterReinit()
{
for (const auto& pickup : PickupDefs)
{
orgLoadPickup(pickup.c_str());
}
for (const auto& carGenerator : CarGeneratorDefs)
{
orgLoadCarGenerator(carGenerator.c_str(), 0);
}
for (const auto& stuntJump : StuntJumpDefs)
{
orgLoadStuntJump(stuntJump.c_str());
}
}
template<std::size_t Index> template<std::size_t Index>
static void (*orgReInitGameObjectVariables)(); static void (*orgReInitGameObjectVariables)();
@ -1513,6 +1562,9 @@ namespace VariableResets
// First reinit "our" variables in case stock ones rely on those during resetting // First reinit "our" variables in case stock ones rely on those during resetting
ReInitOurVariables(); ReInitOurVariables();
orgReInitGameObjectVariables<Index>(); orgReInitGameObjectVariables<Index>();
// Then after the normal restart, re-instate pickups, car generators and stunt jumps from text IPLs as they have been
ReloadObjectDefinitionsAfterReinit();
} }
HOOK_EACH_FUNC(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables); HOOK_EACH_FUNC(ReInitGameObjectVariables, orgReInitGameObjectVariables, ReInitGameObjectVariables);
} }
@ -4406,6 +4458,10 @@ void Patch_SA_10()
std::array<uintptr_t, 2> reInitGameObjectVariables = { 0x53C6DB, 0x53C76D }; std::array<uintptr_t, 2> reInitGameObjectVariables = { 0x53C6DB, 0x53C76D };
HookEach_ReInitGameObjectVariables(reInitGameObjectVariables, InterceptCall); HookEach_ReInitGameObjectVariables(reInitGameObjectVariables, InterceptCall);
InterceptCall(0x5B89E4, orgLoadPickup, LoadPickup_SaveLine);
InterceptCall(0x5B89EE, orgLoadCarGenerator, LoadCarGenerator_SaveLine);
InterceptCall(0x5B89F9, orgLoadStuntJump, LoadStuntJump_SaveLine);
// Variables to reset // Variables to reset
GameVariablesToReset.emplace_back( *(bool**)(0x63E8D8+1) ); // CPlayerPed::bHasDisplayedPlayerQuitEnterCarHelpText GameVariablesToReset.emplace_back( *(bool**)(0x63E8D8+1) ); // CPlayerPed::bHasDisplayedPlayerQuitEnterCarHelpText
GameVariablesToReset.emplace_back( *(bool**)(0x44AC97+1) ); // CGarages::RespraysAreFree GameVariablesToReset.emplace_back( *(bool**)(0x44AC97+1) ); // CGarages::RespraysAreFree
@ -5770,11 +5826,19 @@ void Patch_SA_NewBinaries_Common()
using namespace VariableResets; using namespace VariableResets;
{ {
auto loadPickup = get_pattern("E8 ? ? ? ? EB 1B 6A 00");
auto loadCarGenerator = get_pattern("E8 ? ? ? ? 83 C4 08 EB 11");
auto loadStuntJump = get_pattern("50 E8 ? ? ? ? EB 06", 1);
std::array<void*, 2> reInitGameObjectVariables = { std::array<void*, 2> reInitGameObjectVariables = {
get_pattern( "E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? 38 1D" ), get_pattern( "E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? E8 ? ? ? ? 38 1D" ),
get_pattern( "E8 ? ? ? ? 89 1D ? ? ? ? E8 ? ? ? ? 5E" ) get_pattern( "E8 ? ? ? ? 89 1D ? ? ? ? E8 ? ? ? ? 5E" )
}; };
HookEach_ReInitGameObjectVariables(reInitGameObjectVariables, InterceptCall); HookEach_ReInitGameObjectVariables(reInitGameObjectVariables, InterceptCall);
InterceptCall(loadPickup, orgLoadPickup, LoadPickup_SaveLine);
InterceptCall(loadCarGenerator, orgLoadCarGenerator, LoadCarGenerator_SaveLine);
InterceptCall(loadStuntJump, orgLoadStuntJump, LoadStuntJump_SaveLine);
} }
// Variables to reset // Variables to reset