Merge branch 'master' into opfor

FWGS · Jan 3, 2025 · 690f3ef · 690f3ef
2 parents 9ecbbd4 + e530099
commit 690f3ef
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dlls/player.cpp b/dlls/player.cpp
@@ -505,7 +505,7 @@ int CBasePlayer::TakeDamage( entvars_t *pevInflictor, entvars_t *pevAttacker, fl
 
 	// this cast to INT is critical!!! If a player ends up with 0.5 health, the engine will get that
 	// as an int (zero) and think the player is dead! (this will incite a clientside screentilt, etc)
-	fTookDamage = CBaseMonster::TakeDamage( pevInflictor, pevAttacker, (int)flDamage, bitsDamageType );
+	fTookDamage = CBaseMonster::TakeDamage( pevInflictor, pevAttacker, flDamage >= 0.0f ? floor(flDamage) : ceil(flDamage), bitsDamageType );
 
 	// reset damage time countdown for each type of time based damage player just sustained
 	{