UNLOZE/sm-plugins
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

LagCompensation: ignore entities which could be parented to players (parents: player and weapon_)

Browse Source 
Add support for logic_measure_movement
This commit is contained in:
BotoX 2019-11-01 15:58:14 +01:00
parent f1667d057e
commit 398632051c
2 changed files with 93 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
LagCompensation/gamedata/LagCompensation.games.txt
View File

@ -16,6 +16,12 @@
"linux" "@_ZN12CCSGameRules12RestartRoundEv" "linux" "@_ZN12CCSGameRules12RestartRoundEv"
} }
"CLogicMeasureMovement::SetTarget"
{
"library" "server"
"linux" "@_ZN21CLogicMeasureMovement9SetTargetEPKc"
}
"GetAbsOrigin" "GetAbsOrigin"
{ {
"library" "server" "library" "server"
@ -58,6 +64,21 @@
"return" "void" "return" "void"
"this" "ignore" "this" "ignore"
} }
"CLogicMeasureMovement__SetTarget"
{
"signature" "CLogicMeasureMovement::SetTarget"
"callconv" "thiscall"
"return" "void"
"this" "entity"
"arguments"
{
"pName"
{
"type" "charptr"
}
}
}
} }
} }
} }

107
LagCompensation/scripting/LagCompensation.sp
View File

@ -58,6 +58,7 @@ Handle g_hSetLocalAngles;
Handle g_hUTIL_Remove; Handle g_hUTIL_Remove;
Handle g_hRestartRound; Handle g_hRestartRound;
Handle g_hSetTarget;
char g_aBlockTriggerTouch[MAX_EDICTS] = {0, ...}; char g_aBlockTriggerTouch[MAX_EDICTS] = {0, ...};
char g_aaBlockTouch[MAXPLAYERS + 1][MAX_EDICTS]; char g_aaBlockTouch[MAXPLAYERS + 1][MAX_EDICTS];
@ -127,6 +128,20 @@ public void OnPluginStart()
SetFailState("Failed to detour CCSGameRules__RestartRound."); SetFailState("Failed to detour CCSGameRules__RestartRound.");
} }
// CLogicMeasureMovement::SetTarget
g_hSetTarget = DHookCreateFromConf(hGameData, "CLogicMeasureMovement__SetTarget");
if(!g_hSetTarget)
{
delete hGameData;
SetFailState("Failed to setup detour for CLogicMeasureMovement__SetTarget");
}
if(!DHookEnableDetour(g_hSetTarget, true, Detour_OnSetTargetPost))
{
delete hGameData;
SetFailState("Failed to detour CLogicMeasureMovement__SetTarget.");
}
delete hGameData; delete hGameData;
RegAdminCmd("sm_unlag", Command_AddLagCompensation, ADMFLAG_RCON, "sm_unlag <entidx>"); RegAdminCmd("sm_unlag", Command_AddLagCompensation, ADMFLAG_RCON, "sm_unlag <entidx>");
@ -307,6 +322,29 @@ public MRESReturn Detour_OnRestartRound()
return MRES_Ignored; return MRES_Ignored;
} }
// https://developer.valvesoftware.com/wiki/Logic_measure_movement
public MRESReturn Detour_OnSetTargetPost(int pThis, Handle hParams)
{
int entity = GetEntPropEnt(pThis, Prop_Data, "m_hTarget");
if(!IsValidEntity(entity))
return MRES_Ignored;
char sClassname[64];
if(!GetEntityClassname(entity, sClassname, sizeof(sClassname)))
return MRES_Ignored;
if(!StrEqual(sClassname, "trigger_hurt", false))
return MRES_Ignored;
if(AddEntityForLagCompensation(entity, true))
{
// Filter the trigger from being touched outside of the lag compensation
g_aBlockTriggerTouch[entity] = 1;
}
return MRES_Ignored;
}
public void OnMapStart() public void OnMapStart()
{ {
bool bLate = g_bLateLoad; bool bLate = g_bLateLoad;
@ -657,50 +695,49 @@ public void OnEntitySpawned(int entity, const char[] classname)
if(!IsValidEntity(entity)) if(!IsValidEntity(entity))
return; return;
if(!strncmp(classname, "func_physbox", 12)) bool bTriggerHurt = StrEqual(classname, "trigger_hurt");
bool bPhysBox = !strncmp(classname, "func_physbox", 12);
if(!bTriggerHurt && !bPhysBox)
return;
// Don't lag compensate anything that could be parented to a player
// The player simulation would usually move the entity,
// but we would overwrite that position change by restoring the entity to its previous state.
int iParent = INVALID_ENT_REFERENCE;
char sParentClassname[64];
for(int iTmp = entity;;)
{
iTmp = GetEntPropEnt(iTmp, Prop_Data, "m_pParent");
if(iTmp == INVALID_ENT_REFERENCE)
break;
iParent = iTmp;
GetEntityClassname(iParent, sParentClassname, sizeof(sParentClassname));
if(StrEqual(sParentClassname, "player") ||
strncmp(sParentClassname, "weapon_", 7))
{
return;
}
}
// Lag compensate all physboxes
if(bPhysBox)
{ {
AddEntityForLagCompensation(entity, false); AddEntityForLagCompensation(entity, false);
return; return;
} }
if(!StrEqual(classname, "trigger_hurt")) // Lag compensate all (non player-) parented hurt triggers
return; if(bTriggerHurt && iParent > MaxClients && iParent < MAX_EDICTS)
int iParent = entity;
char sParentClassname[64];
bool bGoodParents = false;
for(;;)
{ {
iParent = GetEntPropEnt(iParent, Prop_Data, "m_pParent"); if(AddEntityForLagCompensation(entity, true))
if(iParent == INVALID_ENT_REFERENCE)
break;
GetEntityClassname(iParent, sParentClassname, sizeof(sParentClassname));
if(strncmp(sParentClassname, "func_", 5))
continue;
if(StrEqual(sParentClassname[5], "movelinear") ||
StrEqual(sParentClassname[5], "door") ||
StrEqual(sParentClassname[5], "rotating") ||
StrEqual(sParentClassname[5], "tracktrain") ||
!strncmp(sParentClassname[5], "physbox", 7))
{ {
bGoodParents = true; // Filter the trigger from being touched outside of the lag compensation
break; g_aBlockTriggerTouch[entity] = 1;
} }
} }
if(iParent == INVALID_ENT_REFERENCE)
return;
if(!bGoodParents)
return;
if(!AddEntityForLagCompensation(entity, true))
return;
g_aBlockTriggerTouch[entity] = 1;
} }
public void OnEntityDestroyed(int entity) public void OnEntityDestroyed(int entity)