Fix ApplyMultiDamage duplicated call on MultiDamage routine (#946)

rehlds · May 8, 2024 · 4ecf427 · 4ecf427
1 parent d7f22ae
commit 4ecf427
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/regamedll/dlls/weapons.cpp b/regamedll/dlls/weapons.cpp
@@ -107,8 +107,14 @@ void EXT_FUNC __API_HOOK(AddMultiDamage)(entvars_t *pevInflictor, CBaseEntity *p
 
 	if (pEntity != gMultiDamage.pEntity)
 	{
-		// UNDONE: wrong attacker!
-		ApplyMultiDamage(pevInflictor, pevInflictor);
+#ifdef REGAMEDLL_FIXES
+		if (gMultiDamage.pEntity) // avoid api calls with null default pEntity
+#endif
+		{
+			// UNDONE: wrong attacker!
+			ApplyMultiDamage(pevInflictor, pevInflictor);
+		}
+
 		gMultiDamage.pEntity = pEntity;
 		gMultiDamage.amount = 0;
 	}