diff --git a/cl_dll/health.cpp b/cl_dll/health.cpp index a16f89c9..58e7b1a3 100644 --- a/cl_dll/health.cpp +++ b/cl_dll/health.cpp @@ -210,9 +210,7 @@ void CHudHealth::GetPainColor( int &r, int &g, int &b ) int CHudHealth::Draw( float flTime ) { - int r, g, b; - int a = 0, x, y; - int HealthWidth; + wrect_t rc; if( ( gHUD.m_iHideHUDDisplay & HIDEHUD_HEALTH ) || gEngfuncs.IsSpectateOnly() ) return 1; diff --git a/cl_dll/health.h b/cl_dll/health.h index 507b75de..f12c3715 100644 --- a/cl_dll/health.h +++ b/cl_dll/health.h @@ -145,7 +145,7 @@ public: float m_fFade; private: - int Ranks[1000]; + int Ranks[1001]; int m_HUD_codrank; int m_HUD_codrank2; wrect_t *m_prc2; diff --git a/dlls/client.cpp b/dlls/client.cpp index 3452dac3..200912a6 100644 --- a/dlls/client.cpp +++ b/dlls/client.cpp @@ -562,7 +562,7 @@ void ClientCommand( edict_t *pEntity ) else if( FStrEq( pcmd, "evangelion" ) ) { char text[256]; - sprintf( text, "Evangelion Unit 01 is active!\n", STRING( pEntity->v.netname ) ); + sprintf( text, "%c%s: Evangelion Unit 01 is active!\n", 2, STRING( pEntity->v.netname ) ); MESSAGE_BEGIN( MSG_ALL, gmsgSayText, NULL ); WRITE_BYTE( ENTINDEX( pEntity ) ); WRITE_STRING( text ); @@ -1136,7 +1136,7 @@ void StartFrame( void ) if( IS_DEDICATED_SERVER() ) { sprintf( msg, "min_bots set to %d\n", min_bots ); - printf( msg ); + printf( "%s", msg ); } } else if( strcmp( cmd, "max_bots" ) == 0 ) @@ -1149,7 +1149,7 @@ void StartFrame( void ) if( IS_DEDICATED_SERVER() ) { sprintf( msg, "max_bots set to %d\n", max_bots ); - printf( msg ); + printf( "%s", msg ); } } else if( strcmp( cmd, "pause" ) == 0 ) @@ -1163,7 +1163,7 @@ void StartFrame( void ) ALERT( at_console, msg ); if( IS_DEDICATED_SERVER() ) - printf( msg ); + printf( "%s", msg ); SERVER_COMMAND( server_cmd ); } diff --git a/dlls/hs/bot.cpp b/dlls/hs/bot.cpp index 28c27f2e..c3dd2ff0 100644 --- a/dlls/hs/bot.cpp +++ b/dlls/hs/bot.cpp @@ -225,7 +225,7 @@ void BotCreate(const char *skin, const char *name, const char *skill) sprintf( err_msg, "model \"%s\" is unknown.\n", c_skin ); UTIL_ClientPrintAll( HUD_PRINTNOTIFY, err_msg ); if (IS_DEDICATED_SERVER()) - printf(err_msg); + printf( "%s", err_msg ); UTIL_ClientPrintAll( HUD_PRINTNOTIFY, "use barney, gina, gman, gordon, helmet, hgrunt,\n"); @@ -2129,4 +2129,4 @@ void CBot::BotThink( void ) 0, 0, pev->button, 0, gpGlobals->frametime * 1000 ); // TheFatal - END -} \ No newline at end of file +} diff --git a/dlls/hs/bot_combat.cpp b/dlls/hs/bot_combat.cpp index 0bfff72c..bf7c8b9f 100644 --- a/dlls/hs/bot_combat.cpp +++ b/dlls/hs/bot_combat.cpp @@ -262,7 +262,7 @@ CBaseEntity * CBot::BotFindEnemy( void ) else { CBaseEntity *pMonster = NULL; - while(pMonster = UTIL_FindEntityByClassname(pMonster, CVAR_GET_STRING("bot_target_ent"))) //For now, bots only hunt for Gay Glenn. + while((pMonster = UTIL_FindEntityByClassname(pMonster, CVAR_GET_STRING("bot_target_ent")))) //For now, bots only hunt for Gay Glenn. { vecEnd = pMonster->EyePosition(); diff --git a/dlls/hs/cod_gamerules.cpp b/dlls/hs/cod_gamerules.cpp index 9c722a44..b676d7f4 100644 --- a/dlls/hs/cod_gamerules.cpp +++ b/dlls/hs/cod_gamerules.cpp @@ -50,7 +50,7 @@ void CCodplay::PlayerSpawn( CBasePlayer *pPlayer ) edict_t *pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 ); - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; @@ -128,4 +128,4 @@ void CCodplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_t DeactivateSatchels( pVictim ); } #endif -} \ No newline at end of file +} diff --git a/dlls/hs/coop_gamerules.cpp b/dlls/hs/coop_gamerules.cpp index 31cb3909..9bc891c0 100644 --- a/dlls/hs/coop_gamerules.cpp +++ b/dlls/hs/coop_gamerules.cpp @@ -34,7 +34,7 @@ void CCoopplay::PlayerSpawn( CBasePlayer *pPlayer ) edict_t *pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 ); - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; @@ -82,4 +82,4 @@ void CCoopplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_ BOOL CCoopplay::IsCoOp( void ) { return TRUE; -} \ No newline at end of file +} diff --git a/dlls/hs/heavyrain_gamerules.cpp b/dlls/hs/heavyrain_gamerules.cpp index 1bbf74e9..bf89650a 100644 --- a/dlls/hs/heavyrain_gamerules.cpp +++ b/dlls/hs/heavyrain_gamerules.cpp @@ -50,7 +50,7 @@ void CHeavyRainplay::PlayerSpawn( CBasePlayer *pPlayer ) edict_t *pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 ); - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; @@ -126,4 +126,4 @@ void CHeavyRainplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, ent int CHeavyRainplay::JasonsStolen(int jason) { return jason; //JASON! I found you! -} \ No newline at end of file +} diff --git a/dlls/hs/monhunt_gamerules.cpp b/dlls/hs/monhunt_gamerules.cpp index baf20b57..2b926d9b 100644 --- a/dlls/hs/monhunt_gamerules.cpp +++ b/dlls/hs/monhunt_gamerules.cpp @@ -202,7 +202,7 @@ void CMonsterplay::PlayerSpawn( CBasePlayer *pPlayer ) edict_t *pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 ); - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; diff --git a/dlls/hs/shytplay_gamerules.cpp b/dlls/hs/shytplay_gamerules.cpp index 7e7e6b9c..222bf8cd 100644 --- a/dlls/hs/shytplay_gamerules.cpp +++ b/dlls/hs/shytplay_gamerules.cpp @@ -597,7 +597,7 @@ void CHalfLifeShytplay::PlayerSpawn( CBasePlayer *pPlayer ) // CBasePlayer *pPlayer; - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; diff --git a/dlls/hs/test_gamerules.cpp b/dlls/hs/test_gamerules.cpp index 224adae6..7b7d5489 100644 --- a/dlls/hs/test_gamerules.cpp +++ b/dlls/hs/test_gamerules.cpp @@ -40,7 +40,7 @@ void CTestplay::PlayerSpawn( CBasePlayer *pPlayer ) edict_t *pClient = g_engfuncs.pfnPEntityOfEntIndex( 1 ); - while ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" )) + while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) ) { pWeaponEntity->Touch( pPlayer ); addDefault = FALSE; @@ -118,4 +118,4 @@ void CTestplay::PlayerKilled( CBasePlayer *pVictim, entvars_t *pKiller, entvars_ BOOL CTestplay::IsTest( void ) { return TRUE; -} \ No newline at end of file +}