TF2Tools: Prevent CalcIsAttackCriticalHelper* from being called twice (…

…#1573) * Ensure CalcIsAttackCriticalHelper only gets called once * fixup: move origReturnValue up
alliedmodders · Sep 23, 2021 · 57a3863 · 57a3863
1 parent a5f99c5
commit 57a3863
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/extensions/tf2/criticals.cpp b/extensions/tf2/criticals.cpp
@@ -191,6 +191,7 @@ bool CritManager::Hook_CalcIsAttackCriticalHelpers(bool noCrits)
 		returnValue = SH_MCALL(pWeapon, CalcIsAttackCriticalHelper)() ? 1 : 0;
 	}
 
+	int origReturnValue = returnValue;
 	int ownerIndex = -1;
 	CBaseHandle &hndl = *(CBaseHandle *) ((intptr_t)pWeapon + info.actual_offset);
 	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_IGNORED, false);
+	RETURN_META_VALUE(MRES_SUPERCEDE, origReturnValue);
 }