summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2007-03-22 00:08:00 +0000
committerTim Angus <tim@ngus.net>2007-03-22 00:08:00 +0000
commit8ca72e6747e916186415d6b4158676e411fbbb5e (patch)
treef045318637d4e00715be5875479727a8452f2219 /src
parentd899c25c571ed061bba9725cf7b35d492cc6e518 (diff)
* Fixes to some GCC 4 warnings
Diffstat (limited to 'src')
-rw-r--r--src/cgame/cg_main.c2
-rw-r--r--src/game/g_cmds.c6
-rw-r--r--src/ui/ui_main.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 8647df8f..8d5929b5 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1318,7 +1318,7 @@ void CG_LoadMenus( const char *menuFile )
len = trap_FS_FOpenFile( "ui/hud.txt", &f, FS_READ );
if( !f )
- trap_Error( va( S_COLOR_RED "default menu file not found: ui/hud.txt, unable to continue!\n", menuFile ) );
+ trap_Error( va( S_COLOR_RED "default menu file not found: ui/hud.txt, unable to continue!\n" ) );
}
if( len >= MAX_MENUDEFFILE )
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index c5a115d0..a139a9a8 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -680,7 +680,7 @@ void Cmd_Team_f( gentity_t *ent )
if( level.alienTeamLocked )
{
trap_SendServerCommand( ent-g_entities,
- va( "print \"Alien team has been ^1LOCKED\n\"", s ) );
+ va( "print \"Alien team has been ^1LOCKED\n\"" ) );
return;
}
else if( level.humanTeamLocked )
@@ -703,7 +703,7 @@ void Cmd_Team_f( gentity_t *ent )
if( level.humanTeamLocked )
{
trap_SendServerCommand( ent-g_entities,
- va( "print \"Human team has been ^1LOCKED\n\"", s ) );
+ va( "print \"Human team has been ^1LOCKED\n\"" ) );
return;
}
else if( level.alienTeamLocked )
@@ -834,7 +834,7 @@ void G_Say( gentity_t *ent, gentity_t *target, int mode, const char *chatText )
Com_sprintf( prefix, sizeof( prefix ), "[H] ");
}
else
- Com_sprintf( prefix, sizeof( prefix ), "");
+ prefix[ 0 ] = '\0';
switch( mode )
{
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 1b1daa1a..f3a81f5a 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -1235,7 +1235,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset) {
trap_Error( va( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile ) );
handle = trap_Parse_LoadSource( "ui/menus.txt" );
if (!handle) {
- trap_Error( va( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!\n", menuFile ) );
+ trap_Error( va( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!\n" ) );
}
}