From a8a23e674ce44e2cad19a39e7e20e3ac81eaaa2b Mon Sep 17 00:00:00 2001 From: Rezyn0 Date: Tue, 15 Jan 2008 11:22:33 +0000 Subject: [PATCH] Fix compiler warnings (issue #4). --- src/game/g_admin.c | 14 ++++++-------- src/game/g_buildable.c | 2 +- src/game/g_cmds.c | 2 +- src/game/g_local.h | 2 ++ src/game/g_main.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/game/g_admin.c b/src/game/g_admin.c index 1e122b9..b23e8f4 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -4255,7 +4255,7 @@ qboolean G_admin_pause( gentity_t *ent, int skiparg ) } if( G_SayArgc() != 2 + skiparg ) { - ADMP( va( "^3!pause: ^7usage: ^7(^5name|slot|*^7)\n", cmd, cmd ) ); + ADMP( va( "^3!%s: ^7usage: !%s ^7(^5name|slot|*^7)\n", cmd, cmd ) ); return qfalse; } @@ -4429,7 +4429,7 @@ qboolean G_admin_buildlog( gentity_t *ent, int skiparg ) gentity_t *builder = NULL; int skip = 0, start = 0, lastID = -1, firstID = -1, i, len, matchlen = 0; pTeam_t team = PTE_NONE; - char startbuf[ 12 ], message[ MAX_STRING_CHARS ], *teamchar; + char message[ MAX_STRING_CHARS ], *teamchar; char *name, *action, *buildablename, markstring[ MAX_STRING_CHARS ]; if( !g_buildLogMaxLength.integer ) { @@ -4457,7 +4457,7 @@ qboolean G_admin_buildlog( gentity_t *ent, int skiparg ) break; case '-': { - int value; + //int value; //if( ( value = G_ClientNumbersFromString( argbuf + 1, pids, MAX_CLIENTS ) ) != 1 ) if( G_ClientNumbersFromString( argbuf + 1, pids ) != 1 ) { @@ -4673,12 +4673,12 @@ qboolean G_admin_revert( gentity_t *ent, int skiparg ) break; case '-': { - int value; + //int value; //if( ( value = G_ClientNumbersFromString( arg + 1, pids, MAX_CLIENTS ) ) != 1 ) if( G_ClientNumbersFromString( arg + 1, pids ) != 1 ) { //G_MatchOnePlayer( pids, value, err, sizeof( err ) ); -+ G_MatchOnePlayer( pids, err, sizeof( err ) ); + G_MatchOnePlayer( pids, err, sizeof( err ) ); ADMP( va( "^3!revert: ^7%s\n", err )); return qfalse; } @@ -5154,10 +5154,8 @@ qboolean G_admin_drop( gentity_t *ent, int skiparg ) int pids[ MAX_CLIENTS ]; char name[ MAX_NAME_LENGTH ], err[ MAX_STRING_CHARS ]; int minargc; - gentity_t *vic; - - minargc = 2 + skiparg; + minargc = 2 + skiparg; if( G_SayArgc() < minargc ) { diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index 2dbfa1f..4fdd5b3 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -4286,7 +4286,7 @@ int G_CountBuildLog( void ) ptr = ptr->next; else { - while( mark = ptr->next ) + while( ( mark = ptr->next ) ) { ptr->next = ptr->next->marked; G_Free( mark ); diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c index 484613f..178e0f2 100644 --- a/src/game/g_cmds.c +++ b/src/game/g_cmds.c @@ -1391,7 +1391,7 @@ void Cmd_CallVote_f( gentity_t *ent ) char arg2[ MAX_STRING_TOKENS ]; char arg3[ MAX_STRING_TOKENS ]; int clientNum = -1; - char name[ MAX_NETNAME ], name2[ MAX_NETNAME ]; + char name[ MAX_NETNAME ]; char *arg2plus; char nullstring[] = ""; char message[ MAX_STRING_CHARS ]; diff --git a/src/game/g_local.h b/src/game/g_local.h index 15b752e..3bfa9cc 100644 --- a/src/game/g_local.h +++ b/src/game/g_local.h @@ -920,6 +920,7 @@ qboolean G_RadiusDamage( vec3_t origin, gentity_t *attacker, float damage, floa gentity_t *ignore, int mod ); qboolean G_SelectiveRadiusDamage( vec3_t origin, gentity_t *attacker, float damage, float radius, gentity_t *ignore, int mod, int team ); +void G_Knockback( gentity_t *targ, vec3_t dir, int knockback ); void body_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int damage, int meansOfDeath ); void AddScore( gentity_t *ent, int score ); @@ -1029,6 +1030,7 @@ qboolean G_FilterPacket( char *from ); void FireWeapon( gentity_t *ent ); void FireWeapon2( gentity_t *ent ); void FireWeapon3( gentity_t *ent ); +void Blow_up( gentity_t *ent ); // // g_cmds.c diff --git a/src/game/g_main.c b/src/game/g_main.c index 28a6b61..76fcc6c 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -1690,10 +1690,10 @@ void ExitLevel( void ) buildHistory_t *tmp, *mark; - while( tmp = level.buildHistory ) + while( ( tmp = level.buildHistory ) ) { level.buildHistory = level.buildHistory->next; - while( mark = tmp ) + while( ( mark = tmp ) ) { tmp = tmp->marked; G_Free( mark );