Skip to content

Steal some FindEntityByName stuff from eventqueuefix and fix #16 #18

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
rtldg wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Steal some FindEntityByName stuff from eventqueuefix and fix #16 #18

Show file tree
Hide file tree
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
47 changes: 47 additions & 0 deletions plugin/gamedata/rngfix.games.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
"windows" "1"
"linux" "2"
}

"m_angRotation"
{
"class" "CBaseEntity"
"prop" "m_angRotation"
}
}
}

Expand Down Expand Up @@ -82,6 +88,27 @@
"windows" "172"
"linux" "172"
}

"FindEntityByName_StaticCall"
{
"windows" "1"
}

"m_RefEHandle"
{
"windows" "12"
"linux" "12"
}
}

"Signatures"
{
// Search "NULL entity in global entity list!" and look for the function that compares to the char '!' at the top.
"FindEntityByName"
{
"windows" "\x55\x8B\xEC\x53\x8B\x5D\x0C\x85\xDB\x74\x2A"
"linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x1C\x8B\x55\x2A\x8B\x5D\x2A\x8B\x7D"
}
}
}

Expand Down Expand Up @@ -154,6 +181,26 @@
"linux" "3"
"linux64" "3"
}

"m_RefEHandle"
{
"windows" "12"
"windows64" "12"
"linux" "12"
"linux64" "12"
}
}

"Signatures"
{
// search for "Can't find landmark %s" to find CChangeLevel::FindLandmark and the first function call inside is the `FindEntityByName` we're looking for...
"FindEntityByName"
{
"windows" "\x55\x8B\xEC\x53\x8B\x5D\x2A\x56\x8B\xF1\x57\x85\xDB\x0F\x84"
"windows64" "\x48\x89\x5C\x24\x2A\x48\x89\x74\x24\x2A\x48\x89\x7C\x24\x2A\x41\x56\x48\x83\xEC\x30\x4D\x8B\xD1"
"linux" "@_ZN17CGlobalEntityList16FindEntityByNameEP11CBaseEntityPKcS1_S1_S1_P17IEntityFindFilter"
"linux64" "@_ZN17CGlobalEntityList16FindEntityByNameEP11CBaseEntityPKcS1_S1_S1_P17IEntityFindFilter"
}
}
}
}
71 changes: 56 additions & 15 deletions plugin/scripting/rngfix.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ public Plugin myinfo =
#define DUCK_MIN_DUCKSPEED 1.5 // Minimum duckspeed to start ducking
#define DEFAULT_JUMP_IMPULSE 301.99337741 // sqrt(2 * 57.0 units * 800.0 u/s^2)

// How many bits to use to encode an edict.
#define MAX_EDICT_BITS 11 // # of bits needed to represent max edicts
// Max # of edicts in a level
#define MAX_EDICTS (1<<MAX_EDICT_BITS)
// Used for networking ehandles.
#define NUM_ENT_ENTRY_BITS (MAX_EDICT_BITS + 1)
#define NUM_ENT_ENTRIES (1 << NUM_ENT_ENTRY_BITS)
#define ENT_ENTRY_MASK (NUM_ENT_ENTRIES - 1)
#define INVALID_EHANDLE_INDEX 0xFFFFFFFF

float g_vecMins[3];
float g_vecMaxsUnducked[3];
float g_vecMaxsDucked[3];
Expand Down Expand Up @@ -85,6 +95,8 @@ Handle g_hPassesTriggerFilters;
Handle g_hProcessMovementHookPre;
Address g_IServerGameEnts;
Handle g_hMarkEntitiesAsTouching;
Handle g_hFindEntityByName;
int g_iRefOffset;

int g_iCMoveData_ForwardMove;
int g_iCMoveData_SideMove;
Expand Down Expand Up @@ -179,7 +191,7 @@ public void OnPluginStart()
g_cvJumpImpulse = FindConVar("sv_jump_impulse");
g_cvAutoBunnyHopping = FindConVar("sv_autobunnyhopping");

Handle gamedataConf = LoadGameConfigFile("rngfix.games");
GameData gamedataConf = new GameData("rngfix.games");
if (gamedataConf == null) SetFailState("Failed to load rngfix gamedata");

// PassesTriggerFilters
Expand Down Expand Up @@ -272,6 +284,25 @@ public void OnPluginStart()

if (g_hMarkEntitiesAsTouching == null) SetFailState("Unable to prepare SDKCall for IServerGameEnts::MarkEntitiesAsTouching");

int m_RefEHandleOff = gamedataConf.GetOffset("m_RefEHandle");
int ibuff = gamedataConf.GetOffset("m_angRotation");
g_iRefOffset = ibuff + m_RefEHandleOff;

if (gamedataConf.GetOffset("FindEntityByName_StaticCall") == 1)
StartPrepSDKCall(SDKCall_Static);
else
StartPrepSDKCall(SDKCall_EntityList);
if(!PrepSDKCall_SetFromConf(gamedataConf, SDKConf_Signature, "FindEntityByName"))
SetFailState("Failed to find FindEntityByName signature.");
PrepSDKCall_SetReturnInfo(SDKType_PlainOldData, SDKPass_ByValue);
PrepSDKCall_AddParameter(SDKType_CBaseEntity, SDKPass_Pointer, VDECODE_FLAG_ALLOWNULL | VDECODE_FLAG_ALLOWWORLD);
PrepSDKCall_AddParameter(SDKType_String, SDKPass_Pointer);
PrepSDKCall_AddParameter(SDKType_CBaseEntity, SDKPass_Pointer, VDECODE_FLAG_ALLOWNULL | VDECODE_FLAG_ALLOWWORLD);
PrepSDKCall_AddParameter(SDKType_CBaseEntity, SDKPass_Pointer, VDECODE_FLAG_ALLOWNULL | VDECODE_FLAG_ALLOWWORLD);
PrepSDKCall_AddParameter(SDKType_CBaseEntity, SDKPass_Pointer, VDECODE_FLAG_ALLOWNULL | VDECODE_FLAG_ALLOWWORLD);
PrepSDKCall_AddParameter(SDKType_PlainOldData, SDKPass_ByValue);
g_hFindEntityByName = EndPrepSDKCall();

delete CreateInterface;
delete gamedataConf;

Expand Down Expand Up @@ -344,24 +375,34 @@ public Action Hook_TriggerStartTouch(int entity, int other)
return Plugin_Continue;
}

// TODO Would be nice to have IServerTools::FindEntityByName / CGlobalEntityList::FindEntityByName
bool NameExists(const char[] targetname)
//Credits to gammacase for this workaround.
int EntityToBCompatRef(Address player)
{
// Assume special types exist
if (targetname[0] == '!') return true;
if(player == Address_Null)
return INVALID_EHANDLE_INDEX;

char targetname2[128];
int m_RefEHandle = LoadFromAddress(player + view_as<Address>(g_iRefOffset), NumberType_Int32);

int max = GetMaxEntities();
for (int entity = 1; entity < max; entity++)
{
if (!IsValidEntity(entity)) continue;
if (GetEntPropString(entity, Prop_Data, "m_iName", targetname2, sizeof(targetname2)) == 0) continue;
if(m_RefEHandle == INVALID_EHANDLE_INDEX)
return INVALID_EHANDLE_INDEX;

if (StrEqual(targetname, targetname2)) return true;
}
// https://github.com/perilouswithadollarsign/cstrike15_src/blob/29e4c1fda9698d5cebcdaf1a0de4b829fa149bf8/public/basehandle.h#L137
int entry_idx = m_RefEHandle & ENT_ENTRY_MASK;

return false;
if(entry_idx >= MAX_EDICTS)
return m_RefEHandle | (1 << 31);

return entry_idx;
}

int FindEntityByName(int startEntity, const char[] targetname, int searchingEnt, int activator, int caller)
{
Address targetEntityAddr = SDKCall(g_hFindEntityByName, startEntity, targetname, searchingEnt, activator, caller, 0);

if(targetEntityAddr == Address_Null)
return -1;

return EntRefToEntIndex(EntityToBCompatRef(targetEntityAddr));
}

public void Hook_TriggerTeleportTouchPost(int entity, int other)
Expand All @@ -373,7 +414,7 @@ public void Hook_TriggerTeleportTouchPost(int entity, int other)
char targetstring[128];
if (GetEntPropString(entity, Prop_Data, "m_target", targetstring, sizeof(targetstring)) == 0) return;

if (!NameExists(targetstring)) return;
if (-1 == FindEntityByName(-1, targetstring, -1, other, other)) return;

if (g_iLastMapTeleportTick[other] == g_iTick[other]-1)
{
Expand Down