YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-13 05:51:19 +00:00
Code Issues Projects Releases Wiki Activity

Double promotion fixes.

Browse Source
This commit is contained in:
Andrey Akhmichin 2020-01-07 05:51:26 +05:00
parent 8f86a8fda6
commit 8daf7f5692
20 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cl_dll/aghl/aghudcustomtimer.cpp
View File

@ -56,7 +56,7 @@ void AgHudCustomTimer::UserCmd_CustomTimer()
{
if (2 == gEngfuncs.Cmd_Argc())
{
m_flTurnoff = gHUD.m_flTime + atof(gEngfuncs.Cmd_Argv(1));
m_flTurnoff = gHUD.m_flTime + (float)atof(gEngfuncs.Cmd_Argv(1));
m_iFlags |= HUD_ACTIVE;
}
}

4
cl_dll/aghl/aghudlocation.cpp
View File

@ -190,7 +190,7 @@ void AgHudLocation::InitDistances()
//Now calculate when you are at/near a location or at atleast when its closest.
m_fAt = fMinDistance / 2; //You are at a location if you are one fourth between to locations.
m_fNear = fMinDistance / 1.1; //Over halfway of the mindistance you are at the "side".
m_fNear = fMinDistance / 1.1f; //Over halfway of the mindistance you are at the "side".
}
bool AgHudLocation::NearestLocation(const Vector& vPosition, AgLocation*& pLocation, float& fNearestdistance)
@ -342,7 +342,7 @@ void AgHudLocation::Save()
{
//Append.
AgLocation* pLocation = *itrLocations;
fprintf(pFile,"%s#%f#%f#%f#",(const char*)pLocation->m_sLocation.c_str(),pLocation->m_vPosition.x,pLocation->m_vPosition.y,pLocation->m_vPosition.z);
fprintf(pFile,"%s#%f#%f#%f#",(const char*)pLocation->m_sLocation.c_str(), (double)pLocation->m_vPosition.x, (double)pLocation->m_vPosition.y, (double)pLocation->m_vPosition.z);
}
fflush(pFile);

2
cl_dll/aghl/agmodel.cpp
View File

@ -268,7 +268,7 @@ bool AgModel::CheckModel(const char* szModelName)
if (vBounds.x > vMaxBounds.x || vBounds.y > vMaxBounds.y || vBounds.z > vMaxBounds.z)
{
char szMessage[256];
sprintf(szMessage,"Server enforces model check and %s is not valid. Your model got these ranges: %.4f,%.4f,%.4f\n",szModelName,vBounds.x, vBounds.y, vBounds.z);
sprintf(szMessage,"Server enforces model check and %s is not valid. Your model got these ranges: %.4f,%.4f,%.4f\n",szModelName, (double)vBounds.x, (double)vBounds.y, (double)vBounds.z);
AgLog(szMessage);
sprintf(szMessage,"Server enforces model check and %s is not valid.\n",szModelName);
ConsolePrint(szMessage);

8
dlls/aghl/agarena.cpp
View File

@ -46,7 +46,7 @@ void AgArena::Think()
if( !pPlayer1 || ( pPlayer1 && !pPlayer1->IsAlive() ) || !pPlayer2 || ( pPlayer2 && !pPlayer2->IsAlive() ) )
{
m_Status = PlayerDied;
m_fNextCountdown = gpGlobals->time + 3.0; //Let the effect of him dying play for 3 seconds
m_fNextCountdown = gpGlobals->time + 3.0f; //Let the effect of him dying play for 3 seconds
if (pPlayer1)
pPlayer1->SetIngame(false); //Cant respawn
@ -59,7 +59,7 @@ void AgArena::Think()
//We only update status once every second.
if (m_fNextCountdown > gpGlobals->time)
return;
m_fNextCountdown = gpGlobals->time + 1.0;
m_fNextCountdown = gpGlobals->time + 1.0f;
//Handle the status
if (Waiting == m_Status)
@ -88,8 +88,8 @@ void AgArena::Think()
if (GetPlayer1() && GetPlayer2())
{
m_Status = Countdown;
m_fMatchStart = gpGlobals->time + 5.0;
m_fNextCountdown = gpGlobals->time + 2.0;
m_fMatchStart = gpGlobals->time + 5.0f;
m_fNextCountdown = gpGlobals->time + 2.0f;
}

8
dlls/aghl/agclient.cpp
View File

@ -162,7 +162,7 @@ bool AgClient::HandleCommand(CBasePlayer* pPlayer)
else if (FStrEq(CMD_ARGV(0), "timeleft" ))
{
if (timelimit.value && timeleft.value)
AgConsole(UTIL_VarArgs("timeleft = %.0f",timeleft.value),pPlayer);
AgConsole(UTIL_VarArgs("timeleft = %.0f", (double)timeleft.value), pPlayer);
return true;
}
else if (FStrEq(CMD_ARGV(0), "timeout" ))
@ -414,7 +414,7 @@ CBaseEntity* FindEntityForward( CBasePlayer* pMe )
TraceResult tr;
UTIL_MakeVectors(pMe->pev->v_angle);
UTIL_TraceLine(pMe->pev->origin + pMe->pev->view_ofs,pMe->pev->origin + pMe->pev->view_ofs + gpGlobals->v_forward * 2048,missile, pMe->edict(), &tr );
if ( tr.flFraction != 1.0 && !FNullEnt( tr.pHit) )
if( tr.flFraction != 1.0f && !FNullEnt( tr.pHit ) )
{
CBaseEntity* pHit = CBaseEntity::Instance( tr.pHit );
return pHit;
@ -470,7 +470,7 @@ void AgClient::Say(CBasePlayer* pPlayer, say_type Type )
{
//Health.
if (pPlayer && pPlayer->IsAlive() && !pPlayer->IsSpectator())
pText = pText + sprintf(pText,"%.0f",pPlayer->pev->health);
pText = pText + sprintf(pText,"%.0f", (double)pPlayer->pev->health);
pSayText++;
continue;
}
@ -556,7 +556,7 @@ void AgClient::Say(CBasePlayer* pPlayer, say_type Type )
{
//Score
if (pPlayer && pPlayer->IsAlive() && !pPlayer->IsSpectator())
pText = pText + sprintf(pText,"%.0f/%d",pPlayer->pev->frags,pPlayer->m_iDeaths);
pText = pText + sprintf(pText,"%.0f/%d", (double)pPlayer->pev->frags, pPlayer->m_iDeaths);
pSayText++;
continue;
}

31
dlls/aghl/agctf.cpp
View File

@ -238,15 +238,15 @@ void AgCTF::RoundBasedThink()
//We only update status once every second.
if (m_fNextCountdown > gpGlobals->time)
return;
m_fNextCountdown = gpGlobals->time + 1.0;
m_fNextCountdown = gpGlobals->time + 1.0f;
//Handle the status
if (Waiting == m_Status)
{
g_bPaused = true;
m_Status = Countdown;
m_fMatchStart = gpGlobals->time + 8.0;
m_fNextCountdown = gpGlobals->time + 3.0;
m_fMatchStart = gpGlobals->time + 8.0f;
m_fNextCountdown = gpGlobals->time + 3.0f;
//Write waiting message
MESSAGE_BEGIN( MSG_ALL, gmsgCountdown);
@ -468,13 +468,13 @@ void AgCTF::PlayerDropFlag(CBasePlayer* pPlayer, bool bPlayerDrop)
pEnt->pev->angles.z = 0;
}
else
pEnt->pev->velocity = pPlayer->pev->velocity * 1.2;
pEnt->pev->velocity = pPlayer->pev->velocity * 1.2f;
pEnt->pev->angles.x = 0;
AgCTFFlag *pFlag = (AgCTFFlag *)pEnt;
if (bPlayerDrop)
pFlag->m_fNextTouch = gpGlobals->time + 0.5; //Gotta give the flag a bit of time to fly away from player before it can be picked up again.
pFlag->m_fNextTouch = gpGlobals->time + 0.5f; //Gotta give the flag a bit of time to fly away from player before it can be picked up again.
pFlag->m_bDropped = true;
pFlag->m_fNextReset = gpGlobals->time + ag_ctf_flag_resettime.value;
@ -498,7 +498,7 @@ enum Flag_Animations
void AgCTFFlag::Spawn ( void )
{
m_fNextTouch = 0;
m_fNextTouch = 0;
Precache( );
SET_MODEL(ENT(pev), "models/flag.mdl");
@ -511,7 +511,7 @@ void AgCTFFlag::Spawn ( void )
SetThink( &AgCTFFlag::Think );
SetTouch( &AgCTFFlag::FlagTouch );
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
if (FStrEq(CTF_TEAM1_NAME, m_szTeamName))
pev->skin = 1;
@ -935,11 +935,11 @@ void AgCTFFlag::Think( void )
return;
}
pev->frame += pev->framerate;
if (pev->frame < 0.0 || pev->frame >= 256.0)
if (pev->frame < 0.0f || pev->frame >= 256.0f)
{
pev->frame -= (int)(pev->frame / 256.0) * 256.0;
pev->frame -= (int)(pev->frame / 256.0f) * 256.0f;
}
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
}
class AgCTFFlagTeam1 : public AgCTFFlag
@ -1050,7 +1050,7 @@ void AgCTFPlayerFlag ::Spawn( )
pev->skin = 2;
SetThink( &AgCTFPlayerFlag::Think );
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
}
void AgCTFPlayerFlag::UpdateOnRemove( void )
@ -1098,11 +1098,11 @@ void AgCTFPlayerFlag::Think( )
pev->sequence = CARRIED;
}
pev->frame += pev->framerate;
if (pev->frame < 0.0 || pev->frame >= 256.0)
if (pev->frame < 0.0f || pev->frame >= 256.0f)
{
pev->frame -= (int)(pev->frame / 256.0) * 256.0;
pev->frame -= (int)(pev->frame / 256.0f) * 256.0f;
}
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
}
}
@ -1482,7 +1482,8 @@ void AgCTFFileItemCache::Save(CBasePlayer* pPlayer)
{
//Append.
AgCTFFileItem* pFileItem = *itrFileItems;
fprintf(pFile,"%s %f %f %f %f %f %f\n",pFileItem->m_szName,pFileItem->m_vOrigin.x,pFileItem->m_vOrigin.y,pFileItem->m_vOrigin.z,pFileItem->m_vAngles.x,pFileItem->m_vAngles.y,pFileItem->m_vAngles.z);
fprintf(pFile, "%s %f %f %f %f %f %f\n", pFileItem->m_szName, (double)pFileItem->m_vOrigin.x, (double)pFileItem->m_vOrigin.y, (double)pFileItem->m_vOrigin.z,
(double)pFileItem->m_vAngles.x, (double)pFileItem->m_vAngles.y, (double)pFileItem->m_vAngles.z);
}
fflush(pFile);

16
dlls/aghl/agdom.cpp
View File

@ -321,7 +321,7 @@ void AgDOMControlPoint::Spawn ( void )
SetThink( &AgDOMControlPoint::Think );
SetTouch( &AgDOMControlPoint::Touch );
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
// spawn by default under no teams control
ChangeControllingTeam( DOM_NEUTRAL_NAME );
@ -387,11 +387,11 @@ void AgDOMControlPoint::Think( void )
// animate the control point
pev->frame += pev->framerate;
if (pev->frame < 0.0 || pev->frame >= 256.0)
if (pev->frame < 0.0f || pev->frame >= 256.0f)
{
pev->frame -= (int)(pev->frame / 256.0) * 256.0;
pev->frame -= (int)(pev->frame / 256.0f) * 256.0f;
}
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
}
@ -400,7 +400,7 @@ void AgDOMControlPoint::Touch( CBaseEntity *pOther )
// prevent CP changing owner too quickly
if (m_fNextTouch > gpGlobals->time)
return;
else m_fNextTouch = gpGlobals->time + 0.5;
else m_fNextTouch = gpGlobals->time + 0.5f;
// if it's not a player, ignore
if ( !pOther->IsPlayer() )
@ -601,8 +601,8 @@ void AgDOMFileItemCache::Save(CBasePlayer* pPlayer)
{
//Append.
AgDOMFileItem* pFileItem = *itrFileItems;
fprintf(pFile,"%s %f %f %f %f %f %f %s\n",pFileItem->m_szName,pFileItem->m_vOrigin.x,pFileItem->m_vOrigin.y,pFileItem->m_vOrigin.z,
pFileItem->m_vAngles.x,pFileItem->m_vAngles.y,pFileItem->m_vAngles.z,
fprintf(pFile,"%s %f %f %f %f %f %f %s\n",pFileItem->m_szName, (double)pFileItem->m_vOrigin.x, (double)pFileItem->m_vOrigin.y, (double)pFileItem->m_vOrigin.z,
(double)pFileItem->m_vAngles.x, (double)pFileItem->m_vAngles.y, (double)pFileItem->m_vAngles.z,
pFileItem->m_szData1);
}
@ -637,4 +637,4 @@ void AgDOMFileItemCache::Init()
}
}
}
}

4
dlls/aghl/aggamerules.cpp
View File

@ -575,7 +575,7 @@ void AgGameRules::ClientDisconnected( edict_t *pClient )
UTIL_LogPrintf("\"%s<%d><%s><%s>\" disconnected (score \"%.0f\")\n",
pPlayer->GetName(), GETPLAYERUSERID( pPlayer->edict() ), GETPLAYERAUTHID( pPlayer->edict() ), pPlayer->TeamID(),
pPlayer->pev->frags );
(double)pPlayer->pev->frags );
// Tell all clients this player isn't a spectator anymore
MESSAGE_BEGIN( MSG_ALL, gmsgSpectator );
@ -589,7 +589,7 @@ void AgGameRules::ClientDisconnected( edict_t *pClient )
if (pPlayerLoop && pPlayer != pPlayerLoop )
{
//Send score to others.
ClientPrint(pPlayerLoop->pev, HUD_PRINTNOTIFY, UTIL_VarArgs("%s left with score %.0f\n",pPlayer->GetName(),pPlayer->pev->frags));
ClientPrint(pPlayerLoop->pev, HUD_PRINTNOTIFY, UTIL_VarArgs("%s left with score %.0f\n", pPlayer->GetName(), (double)pPlayer->pev->frags));
if ((CBaseEntity*)pPlayerLoop->m_hSpectateTarget == pPlayer)
{

2
dlls/aghl/agglobal.cpp
View File

@ -395,7 +395,7 @@ void AgSay(CBasePlayer* pPlayer,const AgString& sText, float* pfFloodProtected,
hText.r2 = hText.g2 = hText.b2 = 0;
hText.a2 = 0;
hText.holdTime = fHoldTime - 0.30;
hText.holdTime = fHoldTime - 0.3f;
hText.effect = 2; // Fade in/out
hText.fadeinTime = 0.01;

12
dlls/aghl/aglms.cpp
View File

@ -39,7 +39,7 @@ void AgLMS::Think()
{
if (m_fNextCountdown > gpGlobals->time)
return;
m_fNextCountdown = gpGlobals->time + 0.5;
m_fNextCountdown = gpGlobals->time + 0.5f;
if (g_pGameRules->IsTeamplay())
{
@ -134,7 +134,7 @@ void AgLMS::Think()
//We only update status once every second.
if (m_fNextCountdown > gpGlobals->time)
return;
m_fNextCountdown = gpGlobals->time + 1.0;
m_fNextCountdown = gpGlobals->time + 1.0f;
//Handle the status
if (Waiting == m_Status)
@ -155,8 +155,8 @@ void AgLMS::Think()
if (setTeams.size() > 1)
{
m_Status = Countdown;
m_fMatchStart = gpGlobals->time + 8.0;
m_fNextCountdown = gpGlobals->time + 3.0;
m_fMatchStart = gpGlobals->time + 8.0f;
m_fNextCountdown = gpGlobals->time + 3.0f;
}
}
else
@ -173,8 +173,8 @@ void AgLMS::Think()
if (iPlayers > 1)
{
m_Status = Countdown;
m_fMatchStart = gpGlobals->time + 8.0;
m_fNextCountdown = gpGlobals->time + 3.0;
m_fMatchStart = gpGlobals->time + 8.0f;
m_fNextCountdown = gpGlobals->time + 3.0f;
}
}

6
dlls/aghl/agmatch.cpp
View File

@ -63,7 +63,7 @@ void AgMatch::Think()
WRITE_STRING( "" );
WRITE_STRING( "" );
MESSAGE_END();
m_fNextSay = gpGlobals->time + 1.0;
m_fNextSay = gpGlobals->time + 1.0f;
#endif
}
}
@ -83,7 +83,7 @@ void AgMatch::Think()
if (m_fNextHLTV < gpGlobals->time)
{
//Send again in one minute.
m_fNextHLTV = gpGlobals->time + 60.0;
m_fNextHLTV = gpGlobals->time + 60.0f;
//Spectator scoreboards
g_pGameRules->HLTV_ResendScoreBoard();
}
@ -117,7 +117,7 @@ void AgMatch::Start(const AgString& sSpawn)
CVAR_SET_FLOAT("sv_ag_show_gibs",0);
//Set match start time.
m_fMatchStart = gpGlobals->time + 10.0;
m_fMatchStart = gpGlobals->time + 10.0f;
m_sSpawnFlag = sSpawn;

2
dlls/aghl/agscorelog.cpp
View File

@ -37,7 +37,7 @@ void AgScoreLog::Think()
Score();
m_fNextLogUpdate = gpGlobals->time + 30.0;
m_fNextLogUpdate = gpGlobals->time + 30.0f;
}
}

4
dlls/aghl/agsettings.cpp
View File

@ -30,7 +30,7 @@ AgSettings::AgSettings()
m_bCheckNextMap = true;
m_bCalcNextMap = true;
m_fNextCheck = gpGlobals->time + 10.0;
m_fNextCheck = gpGlobals->time + 10.0f;
}
AgSettings::~AgSettings()
@ -71,7 +71,7 @@ bool AgSettings::Think()
if (m_bCalcNextMap)
CalcNextMap();
m_fNextCheck = gpGlobals->time + 5.0; //Every 5 seconds.
m_fNextCheck = gpGlobals->time + 5.0f; //Every 5 seconds.
//Check if to display next map.
if( ( m_bCheckNextMap && timelimit.value ) || ( m_bCheckNextMap && fraglimit.value ) )

2
dlls/aghl/agspectator.cpp
View File

@ -161,7 +161,7 @@ void CBasePlayer::Spectate_Start(bool bResetScore)
if (bResetScore)
ResetScore();
pev->nextthink = gpGlobals->time + 0.1;
pev->nextthink = gpGlobals->time + 0.1f;
//Tell clients
UTIL_ClientPrintAll(HUD_PRINTNOTIFY, UTIL_VarArgs("%s entered spectator mode\n",GetName()));

4
dlls/aghl/agtimer.cpp
View File

@ -20,9 +20,9 @@ extern int gmsgTimer;
AgTimer::AgTimer()
{
m_fNextTimerUpdate = gpGlobals->time + 5.0; //Dont start timer directly.
m_fNextTimerUpdate = gpGlobals->time + 5.0f; //Dont start timer directly.
m_fLastTimeCheck = gpGlobals->time;
m_fEffectiveTime = 0.0;
m_fEffectiveTime = 0.0f;
m_pmp_timelimit = CVAR_GET_POINTER("mp_timelimit");
}

2
dlls/aghl/agvote.cpp
View File

@ -398,7 +398,7 @@ void AgVote::Think()
}
//Check if enough.
if (((float)iFor / (float)iPlayers > 0.5))
if (((float)iFor / (float)iPlayers > 0.5f))
{
#ifdef AG_NO_CLIENT_DLL
UTIL_ClientPrintAll(HUD_PRINTCENTER, UTIL_VarArgs("Vote: %s %s\nCalled by: %s\nAccepted!",m_sVote.c_str(),m_sValue.c_str(),m_sCalled.c_str()));

2
dlls/crowbar.cpp
View File

@ -304,7 +304,7 @@ int CCrowbar::Swing( int fFirst )
//++ BulliT
//return TRUE;
{
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25;
m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.25f;
return TRUE;
}
//-- Martin Webrant

4
dlls/gauss.cpp
View File

@ -157,7 +157,7 @@ void CGauss::PrimaryAttack()
if( SGBOW == AgGametype() )
{
PlayEmptySound();
m_flNextSecondaryAttack = m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15;
m_flNextSecondaryAttack = m_flNextPrimaryAttack = UTIL_WeaponTimeBase() + 0.15f;
return;
}
else if( INSTAGIB == AgGametype() )
@ -177,7 +177,7 @@ void CGauss::PrimaryAttack()
StartFire();
m_fInAttack = 0;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.0;
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + 2.0f;
m_pPlayer->m_flNextAttack = UTIL_WeaponTimeBase() + 1;
return;
}

4
dlls/player.cpp
View File

@ -5275,7 +5275,7 @@ CBasePlayer* FindPlayerForward( CBasePlayer* pMe )
UTIL_MakeVectors( pMe->pev->v_angle );
UTIL_TraceLine( pMe->pev->origin + pMe->pev->view_ofs,pMe->pev->origin + pMe->pev->view_ofs + gpGlobals->v_forward * 2048,dont_ignore_monsters, pMe->edict(), &tr );
if( tr.flFraction != 1.0 && !FNullEnt( tr.pHit ) )
if( tr.flFraction != 1.0f && !FNullEnt( tr.pHit ) )
{
CBaseEntity *pHit = CBaseEntity::Instance( tr.pHit );
if( pHit->IsPlayer() )
@ -5294,7 +5294,7 @@ void CBasePlayer::UpdatePlayerId()
// If we should test
if( m_fPlayerIdCheck < gpGlobals->time )
{
m_fPlayerIdCheck = gpGlobals->time + 0.5;
m_fPlayerIdCheck = gpGlobals->time + 0.5f;
CBasePlayer *pPlayer = FindPlayerForward( this );
if( !pPlayer )

2
dlls/player.h
View File

@ -476,7 +476,7 @@ inline void CBasePlayer::Init()
m_bIngame = 1 > ag_match_running.value;
m_bDoneFirstSpawn = false;
m_fPlayerIdCheck = gpGlobals->time + 5.0;
m_fPlayerIdCheck = gpGlobals->time + 5.0f;
m_fDisplayGamemode = 0.0;