Bugfix: trigger_hurt should not inflict more damage than established.

s1lentq · Oct 11, 2016 · 0006bac · 0006bac
1 parent cf95faa
commit 0006bac
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/regamedll/dlls/triggers.cpp b/regamedll/dlls/triggers.cpp
@@ -832,7 +832,11 @@ void CBaseTrigger::HurtTouch(CBaseEntity *pOther)
 	{
 		if (pev->dmgtime > gpGlobals->time)
 		{
+#ifdef REGAMEDLL_FIXES
+			if (gpGlobals->time >= pev->pain_finished)
+#else
 			if (gpGlobals->time != pev->pain_finished)
+#endif
 			{
 				// too early to hurt again, and not same frame with a different entity
 				if (!pOther->IsPlayer())
@@ -868,7 +872,11 @@ void CBaseTrigger::HurtTouch(CBaseEntity *pOther)
 	else
 	{
 		// Original code -- single player
+#ifdef REGAMEDLL_FIXES
+		if (pev->dmgtime > gpGlobals->time && gpGlobals->time >= pev->pain_finished)
+#else
 		if (pev->dmgtime > gpGlobals->time && gpGlobals->time != pev->pain_finished)
+#endif
 		{
 			// too early to hurt again, and not same frame with a different entity
 			return;