fix(gameplay): fix usages of ceil instead of Ceil2Int

mastercoms · mastercoms · commit 16810e58d039 · 2025-02-24T11:15:32.000-05:00
this fixes platform inconsistencies between Linux and Windows
on certain floating point values.

for example, on Windows servers, small ammo packs will grant 41 metal when
on Linux servers they provide the intended 40 metal.

Ceil2Int is also faster computationally
diff --git a/src/game/server/tf/entity_ammopack.cpp b/src/game/server/tf/entity_ammopack.cpp
@@ -66,19 +66,19 @@ bool CAmmoPack::MyTouch( CBasePlayer *pPlayer )
 		float flPackRatio = PackRatios[GetPowerupSize()];
 
 		int iMaxPrimary = pTFPlayer->GetMaxAmmo(TF_AMMO_PRIMARY);
-		if ( pTFPlayer->GiveAmmo( ceil(iMaxPrimary * flPackRatio), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )
+		if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxPrimary * flPackRatio), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )
 		{
 			bSuccess = true;
 		}
 
 		int iMaxSecondary = pTFPlayer->GetMaxAmmo(TF_AMMO_SECONDARY);
-		if ( pTFPlayer->GiveAmmo( ceil(iMaxSecondary * flPackRatio), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )
+		if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxSecondary * flPackRatio), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )
 		{
 			bSuccess = true;
 		}
 
 		int iMaxMetal = pTFPlayer->GetMaxAmmo(TF_AMMO_METAL);
-		if ( pTFPlayer->GiveAmmo( ceil(iMaxMetal * flPackRatio), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )
+		if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxMetal * flPackRatio), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )
 		{
 			bSuccess = true;
 		}
@@ -112,7 +112,7 @@ bool CAmmoPack::MyTouch( CBasePlayer *pPlayer )
 		if ( pTFPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )
 		{
 			int iMaxGrenades1 = pTFPlayer->GetMaxAmmo(TF_AMMO_GRENADES1);
-			if ( pTFPlayer->GiveAmmo( ceil(iMaxGrenades1 * flPackRatio), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )
+			if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxGrenades1 * flPackRatio), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )
 			{
 				bSuccess = true;
 			}
diff --git a/src/game/server/tf/entity_healthkit.cpp b/src/game/server/tf/entity_healthkit.cpp
@@ -90,7 +90,7 @@ bool CHealthKit::MyTouch( CBasePlayer *pPlayer )
 		{
 			float flRuneHealthBonus = ( pTFPlayer->m_Shared.GetCarryingRuneType() != RUNE_KNOCKOUT ) ? pTFPlayer->GetRuneHealthBonus() : 0;
 			
-			float flHealth = ceil( ( pPlayer->GetMaxHealth() - flRuneHealthBonus ) * PackRatios[GetPowerupSize()] );
+			float flHealth = Ceil2Int( ( pPlayer->GetMaxHealth() - flRuneHealthBonus ) * PackRatios[GetPowerupSize()] );
 
 			CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pPlayer, flHealth, mult_health_frompacks );
 
@@ -116,7 +116,7 @@ bool CHealthKit::MyTouch( CBasePlayer *pPlayer )
 			{
 				float flDisguiseHealth = pTFPlayer->m_Shared.GetDisguiseHealth();
 				float flDisguiseMaxHealth = pTFPlayer->m_Shared.GetDisguiseMaxHealth();
-				float flHealthToAdd = ceil(flDisguiseMaxHealth * PackRatios[GetPowerupSize()]);
+				float flHealthToAdd = Ceil2Int(flDisguiseMaxHealth * PackRatios[GetPowerupSize()]);
 
 				// don't want to add more than we're allowed to have
 				if ( flHealthToAdd > flDisguiseMaxHealth - flDisguiseHealth )
@@ -248,19 +248,19 @@ bool CHealthAmmoKit::MyTouch( CBasePlayer *pPlayer )
 				float flPackRatio = PackRatios[GetPowerupSize()];
 
 				int iMaxPrimary = pTFPlayer->GetMaxAmmo( TF_AMMO_PRIMARY );
-				if ( pTFPlayer->GiveAmmo( ceil( iMaxPrimary * flPackRatio ), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )
+				if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxPrimary * flPackRatio ), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )
 				{
 					bAmmoSuccess = true;
 				}
 
 				int iMaxSecondary = pTFPlayer->GetMaxAmmo( TF_AMMO_SECONDARY );
-				if ( pTFPlayer->GiveAmmo( ceil( iMaxSecondary * flPackRatio ), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )
+				if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxSecondary * flPackRatio ), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )
 				{
 					bAmmoSuccess = true;
 				}
 
 				int iMaxMetal = pTFPlayer->GetMaxAmmo( TF_AMMO_METAL );
-				if ( pTFPlayer->GiveAmmo( ceil( iMaxMetal * flPackRatio ), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )
+				if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxMetal * flPackRatio ), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )
 				{
 					bAmmoSuccess = true;
 				}
@@ -278,7 +278,7 @@ bool CHealthAmmoKit::MyTouch( CBasePlayer *pPlayer )
 				if ( pTFPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )
 				{
 					int iMaxGrenades1 = pTFPlayer->GetMaxAmmo( TF_AMMO_GRENADES1 );
-					if ( pTFPlayer->GiveAmmo( ceil( iMaxGrenades1 * flPackRatio ), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )
+					if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxGrenades1 * flPackRatio ), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )
 					{
 						bAmmoSuccess = true;
 					}
diff --git a/src/game/server/tf/tf_ammo_pack.cpp b/src/game/server/tf/tf_ammo_pack.cpp
@@ -345,10 +345,10 @@ void CTFAmmoPack::PackTouch( CBaseEntity *pOther )
 	}
 
 	int iMaxPrimary = pPlayer->GetMaxAmmo(TF_AMMO_PRIMARY);
-	GiveAmmo( ceil( iMaxPrimary * m_flAmmoRatio ), TF_AMMO_PRIMARY );
+	GiveAmmo( Ceil2Int( iMaxPrimary * m_flAmmoRatio ), TF_AMMO_PRIMARY );
 
 	int iMaxSecondary = pPlayer->GetMaxAmmo(TF_AMMO_SECONDARY);
-	GiveAmmo( ceil( iMaxSecondary * m_flAmmoRatio ), TF_AMMO_SECONDARY );
+	GiveAmmo( Ceil2Int( iMaxSecondary * m_flAmmoRatio ), TF_AMMO_SECONDARY );
 
 	int iAmmoTaken = 0;
 
@@ -393,7 +393,7 @@ void CTFAmmoPack::PackTouch( CBaseEntity *pOther )
 	if ( pPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )
 	{
 		int iMaxGrenades1 = pPlayer->GetMaxAmmo( TF_AMMO_GRENADES1 );
-		iAmmoTaken += pPlayer->GiveAmmo( ceil(iMaxGrenades1 * m_flAmmoRatio), TF_AMMO_GRENADES1 );
+		iAmmoTaken += pPlayer->GiveAmmo( Ceil2Int(iMaxGrenades1 * m_flAmmoRatio), TF_AMMO_GRENADES1 );
 	}
 
 	if ( m_PackType == AP_HALLOWEEN )
diff --git a/src/game/server/tf/tf_obj.cpp b/src/game/server/tf/tf_obj.cpp
@@ -1604,7 +1604,7 @@ void CBaseObject::SetHealth( float flHealth )
 	bool changed = m_flHealth != flHealth;
 
 	m_flHealth = flHealth;
-	m_iHealth = ceil(m_flHealth);
+	m_iHealth = Ceil2Int(m_flHealth);
 
 
 	/*
@@ -2950,7 +2950,7 @@ int CBaseObject::Command_Repair( CTFPlayer *pActivator, float flAmount, float fl
 	
 	float flRepairAmountMax = flAmount * flRepairMod;
 	int iRepairAmount = Min( RoundFloatToInt( flRepairAmountMax ), GetMaxHealth() - RoundFloatToInt( GetHealth() ) );
-	int iRepairCost = ceil( (float)( iRepairAmount ) / flRepairToMetalRatio );
+	int iRepairCost = Ceil2Int( (float)( iRepairAmount ) / flRepairToMetalRatio );
 	if ( iRepairCost > pActivator->GetBuildResources() )
 	{
 		// What can we afford?
diff --git a/src/game/server/tf/tf_obj_teleporter.cpp b/src/game/server/tf/tf_obj_teleporter.cpp
@@ -690,7 +690,7 @@ int CObjectTeleporter::Command_Repair( CTFPlayer *pActivator, float flAmount, fl
 		{
 			float flRepairAmountMax = flAmount * flRepairMod;
 			int iRepairAmount = Min( flRepairAmountMax, pMatch->GetMaxHealth() - pMatch->GetHealth() );
-			int iRepairCost = ceil( (float)iRepairAmount / flRepairToMetalRatio );
+			int iRepairCost = Ceil2Int( (float)iRepairAmount / flRepairToMetalRatio );
 			if ( iRepairCost > pActivator->GetBuildResources() )
 			{
 				// What can we afford?
diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp
@@ -1915,7 +1915,7 @@ void CTFPlayer::RegenThink( void )
 	}
 	else if ( m_flAccumulatedHealthRegen < -1.f )
 	{
-		nHealAmount = ceil( m_flAccumulatedHealthRegen );
+		nHealAmount = Ceil2Int( m_flAccumulatedHealthRegen );
 		TakeDamage( CTakeDamageInfo( this, this, NULL, vec3_origin, WorldSpaceCenter(), nHealAmount * -1, DMG_GENERIC ) );
 	}
 
@@ -2049,7 +2049,7 @@ void CTFPlayer::RuneRegenThink( void )
 	}
 	else if ( m_flAccumulatedRuneHealthRegen < -1.0 )
 	{
-		nHealAmount = ceil( m_flAccumulatedRuneHealthRegen );
+		nHealAmount = Ceil2Int( m_flAccumulatedRuneHealthRegen );
 		TakeDamage( CTakeDamageInfo( this, this, NULL, vec3_origin, WorldSpaceCenter(), nHealAmount * -1, DMG_GENERIC ) );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -66,19 +66,19 @@ bool CAmmoPack::MyTouch( CBasePlayer *pPlayer )`
`66`	`66`	`float flPackRatio = PackRatios[GetPowerupSize()];`
`67`	`67`
`68`	`68`	`int iMaxPrimary = pTFPlayer->GetMaxAmmo(TF_AMMO_PRIMARY);`
`69`		`- if ( pTFPlayer->GiveAmmo( ceil(iMaxPrimary * flPackRatio), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )`
	`69`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxPrimary * flPackRatio), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )`
`70`	`70`	`{`
`71`	`71`	`bSuccess = true;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`int iMaxSecondary = pTFPlayer->GetMaxAmmo(TF_AMMO_SECONDARY);`
`75`		`- if ( pTFPlayer->GiveAmmo( ceil(iMaxSecondary * flPackRatio), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )`
	`75`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxSecondary * flPackRatio), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )`
`76`	`76`	`{`
`77`	`77`	`bSuccess = true;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`int iMaxMetal = pTFPlayer->GetMaxAmmo(TF_AMMO_METAL);`
`81`		`- if ( pTFPlayer->GiveAmmo( ceil(iMaxMetal * flPackRatio), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )`
	`81`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxMetal * flPackRatio), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )`
`82`	`82`	`{`
`83`	`83`	`bSuccess = true;`
`84`	`84`	`}`
`@@ -112,7 +112,7 @@ bool CAmmoPack::MyTouch( CBasePlayer *pPlayer )`
`112`	`112`	`if ( pTFPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )`
`113`	`113`	`{`
`114`	`114`	`int iMaxGrenades1 = pTFPlayer->GetMaxAmmo(TF_AMMO_GRENADES1);`
`115`		`- if ( pTFPlayer->GiveAmmo( ceil(iMaxGrenades1 * flPackRatio), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )`
	`115`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int(iMaxGrenades1 * flPackRatio), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )`
`116`	`116`	`{`
`117`	`117`	`bSuccess = true;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ bool CHealthKit::MyTouch( CBasePlayer *pPlayer )`
`90`	`90`	`{`
`91`	`91`	`float flRuneHealthBonus = ( pTFPlayer->m_Shared.GetCarryingRuneType() != RUNE_KNOCKOUT ) ? pTFPlayer->GetRuneHealthBonus() : 0;`
`92`	`92`
`93`		`- float flHealth = ceil( ( pPlayer->GetMaxHealth() - flRuneHealthBonus ) * PackRatios[GetPowerupSize()] );`
	`93`	`+ float flHealth = Ceil2Int( ( pPlayer->GetMaxHealth() - flRuneHealthBonus ) * PackRatios[GetPowerupSize()] );`
`94`	`94`
`95`	`95`	`CALL_ATTRIB_HOOK_FLOAT_ON_OTHER( pPlayer, flHealth, mult_health_frompacks );`
`96`	`96`
`@@ -116,7 +116,7 @@ bool CHealthKit::MyTouch( CBasePlayer *pPlayer )`
`116`	`116`	`{`
`117`	`117`	`float flDisguiseHealth = pTFPlayer->m_Shared.GetDisguiseHealth();`
`118`	`118`	`float flDisguiseMaxHealth = pTFPlayer->m_Shared.GetDisguiseMaxHealth();`
`119`		`- float flHealthToAdd = ceil(flDisguiseMaxHealth * PackRatios[GetPowerupSize()]);`
	`119`	`+ float flHealthToAdd = Ceil2Int(flDisguiseMaxHealth * PackRatios[GetPowerupSize()]);`
`120`	`120`
`121`	`121`	`// don't want to add more than we're allowed to have`
`122`	`122`	`if ( flHealthToAdd > flDisguiseMaxHealth - flDisguiseHealth )`
`@@ -248,19 +248,19 @@ bool CHealthAmmoKit::MyTouch( CBasePlayer *pPlayer )`
`248`	`248`	`float flPackRatio = PackRatios[GetPowerupSize()];`
`249`	`249`
`250`	`250`	`int iMaxPrimary = pTFPlayer->GetMaxAmmo( TF_AMMO_PRIMARY );`
`251`		`- if ( pTFPlayer->GiveAmmo( ceil( iMaxPrimary * flPackRatio ), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )`
	`251`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxPrimary * flPackRatio ), TF_AMMO_PRIMARY, true, kAmmoSource_Pickup ) )`
`252`	`252`	`{`
`253`	`253`	`bAmmoSuccess = true;`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`int iMaxSecondary = pTFPlayer->GetMaxAmmo( TF_AMMO_SECONDARY );`
`257`		`- if ( pTFPlayer->GiveAmmo( ceil( iMaxSecondary * flPackRatio ), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )`
	`257`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxSecondary * flPackRatio ), TF_AMMO_SECONDARY, true, kAmmoSource_Pickup ) )`
`258`	`258`	`{`
`259`	`259`	`bAmmoSuccess = true;`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`int iMaxMetal = pTFPlayer->GetMaxAmmo( TF_AMMO_METAL );`
`263`		`- if ( pTFPlayer->GiveAmmo( ceil( iMaxMetal * flPackRatio ), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )`
	`263`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxMetal * flPackRatio ), TF_AMMO_METAL, true, kAmmoSource_Pickup ) )`
`264`	`264`	`{`
`265`	`265`	`bAmmoSuccess = true;`
`266`	`266`	`}`
`@@ -278,7 +278,7 @@ bool CHealthAmmoKit::MyTouch( CBasePlayer *pPlayer )`
`278`	`278`	`if ( pTFPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )`
`279`	`279`	`{`
`280`	`280`	`int iMaxGrenades1 = pTFPlayer->GetMaxAmmo( TF_AMMO_GRENADES1 );`
`281`		`- if ( pTFPlayer->GiveAmmo( ceil( iMaxGrenades1 * flPackRatio ), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )`
	`281`	`+ if ( pTFPlayer->GiveAmmo( Ceil2Int( iMaxGrenades1 * flPackRatio ), TF_AMMO_GRENADES1, true, kAmmoSource_Pickup ) )`
`282`	`282`	`{`
`283`	`283`	`bAmmoSuccess = true;`
`284`	`284`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,10 +345,10 @@ void CTFAmmoPack::PackTouch( CBaseEntity *pOther )`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`int iMaxPrimary = pPlayer->GetMaxAmmo(TF_AMMO_PRIMARY);`
`348`		`- GiveAmmo( ceil( iMaxPrimary * m_flAmmoRatio ), TF_AMMO_PRIMARY );`
	`348`	`+ GiveAmmo( Ceil2Int( iMaxPrimary * m_flAmmoRatio ), TF_AMMO_PRIMARY );`
`349`	`349`
`350`	`350`	`int iMaxSecondary = pPlayer->GetMaxAmmo(TF_AMMO_SECONDARY);`
`351`		`- GiveAmmo( ceil( iMaxSecondary * m_flAmmoRatio ), TF_AMMO_SECONDARY );`
	`351`	`+ GiveAmmo( Ceil2Int( iMaxSecondary * m_flAmmoRatio ), TF_AMMO_SECONDARY );`
`352`	`352`
`353`	`353`	`int iAmmoTaken = 0;`
`354`	`354`
`@@ -393,7 +393,7 @@ void CTFAmmoPack::PackTouch( CBaseEntity *pOther )`
`393`	`393`	`if ( pPlayer->IsPlayerClass( TF_CLASS_ENGINEER ) )`
`394`	`394`	`{`
`395`	`395`	`int iMaxGrenades1 = pPlayer->GetMaxAmmo( TF_AMMO_GRENADES1 );`
`396`		`- iAmmoTaken += pPlayer->GiveAmmo( ceil(iMaxGrenades1 * m_flAmmoRatio), TF_AMMO_GRENADES1 );`
	`396`	`+ iAmmoTaken += pPlayer->GiveAmmo( Ceil2Int(iMaxGrenades1 * m_flAmmoRatio), TF_AMMO_GRENADES1 );`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`if ( m_PackType == AP_HALLOWEEN )`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ int CObjectTeleporter::Command_Repair( CTFPlayer *pActivator, float flAmount, fl`
`690`	`690`	`{`
`691`	`691`	`float flRepairAmountMax = flAmount * flRepairMod;`
`692`	`692`	`int iRepairAmount = Min( flRepairAmountMax, pMatch->GetMaxHealth() - pMatch->GetHealth() );`
`693`		`- int iRepairCost = ceil( (float)iRepairAmount / flRepairToMetalRatio );`
	`693`	`+ int iRepairCost = Ceil2Int( (float)iRepairAmount / flRepairToMetalRatio );`
`694`	`694`	`if ( iRepairCost > pActivator->GetBuildResources() )`
`695`	`695`	`{`
`696`	`696`	`// What can we afford?`
Original file line number	Diff line number	Diff line change
`@@ -1915,7 +1915,7 @@ void CTFPlayer::RegenThink( void )`
`1915`	`1915`	`}`
`1916`	`1916`	`else if ( m_flAccumulatedHealthRegen < -1.f )`
`1917`	`1917`	`{`
`1918`		`- nHealAmount = ceil( m_flAccumulatedHealthRegen );`
	`1918`	`+ nHealAmount = Ceil2Int( m_flAccumulatedHealthRegen );`
`1919`	`1919`	`TakeDamage( CTakeDamageInfo( this, this, NULL, vec3_origin, WorldSpaceCenter(), nHealAmount * -1, DMG_GENERIC ) );`
`1920`	`1920`	`}`
`1921`	`1921`
`@@ -2049,7 +2049,7 @@ void CTFPlayer::RuneRegenThink( void )`
`2049`	`2049`	`}`
`2050`	`2050`	`else if ( m_flAccumulatedRuneHealthRegen < -1.0 )`
`2051`	`2051`	`{`
`2052`		`- nHealAmount = ceil( m_flAccumulatedRuneHealthRegen );`
	`2052`	`+ nHealAmount = Ceil2Int( m_flAccumulatedRuneHealthRegen );`
`2053`	`2053`	`TakeDamage( CTakeDamageInfo( this, this, NULL, vec3_origin, WorldSpaceCenter(), nHealAmount * -1, DMG_GENERIC ) );`
`2054`	`2054`	`}`
`2055`	`2055`