summaryrefslogtreecommitdiff
path: root/src/cgame
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2013-01-12 23:55:21 +0000
committerTim Angus <tim@ngus.net>2013-01-12 23:55:21 +0000
commit0f43dc6df58569ceb32475c4a4009ea6de437923 (patch)
treedc2f7b0e108658f1591409ffed95b8e340f8cc12 /src/cgame
parent16b581e90f1df605141d157edad1a75b4594f479 (diff)
Fix a bunch of warnings
Diffstat (limited to 'src/cgame')
-rw-r--r--src/cgame/cg_buildable.c2
-rw-r--r--src/cgame/cg_local.h4
-rw-r--r--src/cgame/cg_particles.c4
-rw-r--r--src/cgame/cg_players.c2
-rw-r--r--src/cgame/cg_servercmds.c2
-rw-r--r--src/cgame/cg_trails.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index d2bbe05b..369277d1 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -438,7 +438,7 @@ static void CG_RunBuildableLerpFrame( centity_t *cent )
if( newAnimation != lf->animationNumber || !lf->animation )
{
if( cg_debugRandom.integer )
- CG_Printf( "newAnimation: %d lf->animationNumber: %d lf->animation: %d\n",
+ CG_Printf( "newAnimation: %d lf->animationNumber: %d lf->animation: 0x%p\n",
newAnimation, lf->animationNumber, lf->animation );
CG_SetBuildableLerpFrameAnimation( buildable, lf, newAnimation );
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 797d0c2c..50dc8340 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1541,8 +1541,8 @@ extern vmCvar_t cg_chatTeamPrefix;
const char *CG_ConfigString( int index );
const char *CG_Argv( int arg );
-void QDECL CG_Printf( const char *msg, ... );
-void QDECL CG_Error( const char *msg, ... );
+void QDECL CG_Printf( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
+void QDECL CG_Error( const char *msg, ... ) __attribute__ ((format (printf, 1, 2)));
void CG_StartMusic( void );
int CG_PlayerCount( void );
diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c
index d26002a5..0e1a0357 100644
--- a/src/cgame/cg_particles.c
+++ b/src/cgame/cg_particles.c
@@ -793,7 +793,7 @@ static qboolean CG_ParseParticle( baseParticle_t *bp, char **text_p )
if( bp->numModels > 0 )
{
CG_Printf( S_COLOR_RED "ERROR: 'shader' not allowed in "
- "conjunction with 'model'\n", token );
+ "conjunction with 'model'\n" );
break;
}
@@ -814,7 +814,7 @@ static qboolean CG_ParseParticle( baseParticle_t *bp, char **text_p )
if( bp->numFrames > 0 )
{
CG_Printf( S_COLOR_RED "ERROR: 'model' not allowed in "
- "conjunction with 'shader'\n", token );
+ "conjunction with 'shader'\n" );
break;
}
diff --git a/src/cgame/cg_players.c b/src/cgame/cg_players.c
index e5becd27..fb8e2c24 100644
--- a/src/cgame/cg_players.c
+++ b/src/cgame/cg_players.c
@@ -2355,7 +2355,7 @@ void CG_ResetPlayerEntity( centity_t *cent )
cent->pe.nonseg.pitching = qfalse;
if( cg_debugPosition.integer )
- CG_Printf( "%i ResetPlayerEntity yaw=%i\n", cent->currentState.number, cent->pe.torso.yawAngle );
+ CG_Printf( "%i ResetPlayerEntity yaw=%f\n", cent->currentState.number, cent->pe.torso.yawAngle );
}
/*
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index dff02805..b501ecbc 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -1246,7 +1246,7 @@ static void CG_GameCmds_f( void )
if( len + gcmdsOffset >= sizeof( registeredCmds ) - 1 )
{
CG_Printf( "AddCommand: too many commands (%d >= %d)\n",
- len + gcmdsOffset, sizeof( registeredCmds ) - 1 );
+ (int)( len + gcmdsOffset ), (int)( sizeof( registeredCmds ) - 1 ) );
return;
}
trap_AddCommand( cmd );
diff --git a/src/cgame/cg_trails.c b/src/cgame/cg_trails.c
index 05f5ef5e..759ffcfe 100644
--- a/src/cgame/cg_trails.c
+++ b/src/cgame/cg_trails.c
@@ -898,7 +898,7 @@ static qboolean CG_ParseTrailBeam( baseTrailBeam_t *btb, char **text_p )
{
if( btb->numJitters == MAX_TRAIL_BEAM_JITTERS )
{
- CG_Printf( S_COLOR_RED "ERROR: too many jitters\n", token );
+ CG_Printf( S_COLOR_RED "ERROR: too many jitters\n" );
break;
}