Skip to content

feat(extra-natives-rdr3): Allow scenario usage without gender check #3680

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 1 commit into
base: master
Choose a base branch
from
+49 −0
Open

feat(extra-natives-rdr3): Allow scenario usage without gender check #3680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 49 additions & 0 deletions code/components/extra-natives-rdr3/src/NativeFixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,21 @@

#include <ScriptEngine.h>
#include <Hooking.h>
#include "Hooking.Stubs.h"
#include <scrEngine.h>
#include <CrossBuildRuntime.h>
#include "RageParser.h"
#include "ScriptWarnings.h"
#include <EntitySystem.h>
#include <CoreConsole.h>
#include <vector>

static bool* g_textCentre;
static bool* g_textDropshadow;

static bool g_skipScenarioMaleCheck = false;
static bool g_skipScenarioFemaleCheck = false;

struct netObject
{
char pad[64]; // +0
Expand Down Expand Up @@ -149,6 +154,44 @@ static void FixPedCombatAttributes()
});
}

static InitFunction initFunction([]()
{
static ConVar<bool> g_skipScenarioMaleCheckConVar("sv_skipScenarioMaleCheck", ConVar_Replicated, false, &g_skipScenarioMaleCheck);
static ConVar<bool> g_skipScenarioFemaleCheckConVar("sv_skipScenarioFemaleCheck", ConVar_Replicated, false, &g_skipScenarioFemaleCheck);
});

static hook::cdecl_stub<bool(CPed* ped)> hasPlayerComponent([]()
{
return hook::get_pattern("0F 95 C0 C3 48 83 EC ? 83 F9", -40);
});


static bool (*g_origCAIConditionIsMale)(void* self, void* context);
static bool CAIConditionIsMale(void* self, void* context)
{
int v3 = *(int*)((char*)self + 16);
CPed* ped = *(CPed**)((char*)context + 192 + (8 * v3));

if (g_skipScenarioMaleCheck && ped && hasPlayerComponent(ped))
{
return true;
}
return g_origCAIConditionIsMale(self, context);
}

static bool (*g_origCAIConditionIsFemale)(void* self, void* context);
static bool CAIConditionIsFemale(void* self, void* context)
{
int v3 = *(int*)((char*)self + 16);
CPed* ped = *(CPed**)((char*)context + 192 + (8 * v3));

if (g_skipScenarioFemaleCheck && ped && hasPlayerComponent(ped))
{
return true;
}
return g_origCAIConditionIsFemale(self, context);
}

static HookFunction hookFunction([]()
{
{
Expand Down Expand Up @@ -216,4 +259,10 @@ static HookFunction hookFunction([]()
// mov rax, [r14] (restore rax value from r14)
hook::put((char*)location + 10, 0x068B49);
}

{
// Allow players to use scenario without checking the gender
g_origCAIConditionIsFemale = hook::trampoline(hook::get_pattern("48 F7 DA 48 1B C0 48 23 C1 8A 40 ? C0 E8 ? F6 D0 24 ? EB ? 49 8B C8", -0x30), CAIConditionIsFemale);
g_origCAIConditionIsMale = hook::trampoline(hook::get_pattern("48 F7 DA 48 1B C0 48 23 C1 8A 40 ? C0 E8 ? 24 ? EB", -0x4F), CAIConditionIsMale);
}
});
Loading