UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TF2Tools: Prevent CalcIsAttackCriticalHelper* from being called twice (#1573)

Browse Source 
* Ensure CalcIsAttackCriticalHelper only gets called once

* fixup: move origReturnValue up
This commit is contained in:
nosoop 2021-09-23 03:00:52 -07:00 committed by GitHub
parent a5f99c57e1
commit 57a38636fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/tf2/criticals.cpp
View File

@ -191,6 +191,7 @@ bool CritManager::Hook_CalcIsAttackCriticalHelpers(bool noCrits)
returnValue = SH_MCALL(pWeapon, CalcIsAttackCriticalHelper)() ? 1 : 0; returnValue = SH_MCALL(pWeapon, CalcIsAttackCriticalHelper)() ? 1 : 0;
} }
int origReturnValue = returnValue;
int ownerIndex = -1; int ownerIndex = -1;
CBaseHandle &hndl = *(CBaseHandle *) ((intptr_t)pWeapon + info.actual_offset); CBaseHandle &hndl = *(CBaseHandle *) ((intptr_t)pWeapon + info.actual_offset);
CBaseEntity *pHandleEntity = gamehelpers->ReferenceToEntity(hndl.GetEntryIndex()); CBaseEntity *pHandleEntity = gamehelpers->ReferenceToEntity(hndl.GetEntryIndex());
@ -214,5 +215,5 @@ bool CritManager::Hook_CalcIsAttackCriticalHelpers(bool noCrits)
RETURN_META_VALUE(MRES_SUPERCEDE, returnValue); RETURN_META_VALUE(MRES_SUPERCEDE, returnValue);
} }
RETURN_META_VALUE(MRES_IGNORED, false); RETURN_META_VALUE(MRES_SUPERCEDE, origReturnValue);
} }