Skip to content
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

fix(game/five): fix crash related to river entities #3184

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −0
Open

fix(game/five): fix crash related to river entities #3184

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
23 changes: 23 additions & 0 deletions code/components/gta-core-five/src/CrashFixes.RiverEntities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#include <StdInc.h>
#include <Hooking.h>
#include <Hooking.Stubs.h>

static void* (*g_orig_River__GetRiverEntity)(int RiverEntity);

static void (*g_orig_GetBoundingBoxZForRiverEntity)(int RiverEntityIndex, float* MinZ, float* MaxZ);
static void GetBoundingBoxZForRiverEntity(int RiverEntityIndex, float* MinZ, float* MaxZ)
{
void* entity = g_orig_River__GetRiverEntity(RiverEntityIndex);
if (!entity)
return;

g_orig_GetBoundingBoxZForRiverEntity(RiverEntityIndex, MinZ, MaxZ);
}

static HookFunction hookFunction([]
{
static auto RiverEntity = hook::get_pattern("E8 ? ? ? ? 48 8B 48 ? 4C 8D 44 24"); // call for GetRiverEntity
g_orig_River__GetRiverEntity = (decltype(g_orig_River__GetRiverEntity))hook::get_call(RiverEntity);

g_orig_GetBoundingBoxZForRiverEntity = hook::trampoline(hook::get_pattern("48 89 5C 24 ? 57 48 81 EC A0 00 00 00 49 8B F8"), GetBoundingBoxZForRiverEntity);
});
Loading