ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-10 06:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove a bunch of superfluous formatting calls

Browse source 
From /dev/humancontroller.
This commit is contained in:
Zack Middleton 2012-06-19 14:52:22 +00:00
parent 20c6d1e33f
commit 2db73231eb
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/cgame/cg_main.c
View file

@ -446,7 +446,7 @@ void QDECL Com_Error( int level, const char *error, ... ) {
Q_vsnprintf (text, sizeof(text), error, argptr); Q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
CG_Error( "%s", text); trap_Error( text );
} }
void QDECL Com_Printf( const char *msg, ... ) { void QDECL Com_Printf( const char *msg, ... ) {
@ -457,7 +457,7 @@ void QDECL Com_Printf( const char *msg, ... ) {
Q_vsnprintf (text, sizeof(text), msg, argptr); Q_vsnprintf (text, sizeof(text), msg, argptr);
va_end (argptr); va_end (argptr);
CG_Printf ("%s", text); trap_Print( text );
} }
/* /*

8
code/game/g_cmds.c
View file

@ -110,11 +110,11 @@ CheatsOk
*/ */
qboolean CheatsOk( gentity_t *ent ) { qboolean CheatsOk( gentity_t *ent ) {
if ( !g_cheats.integer ) { if ( !g_cheats.integer ) {
trap_SendServerCommand( ent-g_entities, va("print \"Cheats are not enabled on this server.\n\"")); trap_SendServerCommand( ent-g_entities, "print \"Cheats are not enabled on this server.\n\"");
return qfalse; return qfalse;
} }
if ( ent->health <= 0 ) { if ( ent->health <= 0 ) {
trap_SendServerCommand( ent-g_entities, va("print \"You must be alive to use this command.\n\"")); trap_SendServerCommand( ent-g_entities, "print \"You must be alive to use this command.\n\"");
return qfalse; return qfalse;
} }
return qtrue; return qtrue;
@ -1536,11 +1536,11 @@ void Cmd_SetViewpos_f( gentity_t *ent ) {
int i; int i;
if ( !g_cheats.integer ) { if ( !g_cheats.integer ) {
trap_SendServerCommand( ent-g_entities, va("print \"Cheats are not enabled on this server.\n\"")); trap_SendServerCommand( ent-g_entities, "print \"Cheats are not enabled on this server.\n\"");
return; return;
} }
if ( trap_Argc() != 5 ) { if ( trap_Argc() != 5 ) {
trap_SendServerCommand( ent-g_entities, va("print \"usage: setviewpos x y z yaw\n\"")); trap_SendServerCommand( ent-g_entities, "print \"usage: setviewpos x y z yaw\n\"");
return; return;
} }

4
code/game/g_main.c
View file

@ -545,7 +545,7 @@ void QDECL Com_Error ( int level, const char *error, ... ) {
Q_vsnprintf (text, sizeof(text), error, argptr); Q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
G_Error( "%s", text); trap_Error( text );
} }
void QDECL Com_Printf( const char *msg, ... ) { void QDECL Com_Printf( const char *msg, ... ) {
@ -556,7 +556,7 @@ void QDECL Com_Printf( const char *msg, ... ) {
Q_vsnprintf (text, sizeof(text), msg, argptr); Q_vsnprintf (text, sizeof(text), msg, argptr);
va_end (argptr); va_end (argptr);
G_Printf ("%s", text); trap_Print( text );
} }
/* /*

4
code/q3_ui/ui_atoms.c
View file

@ -38,7 +38,7 @@ void QDECL Com_Error( int level, const char *error, ... ) {
Q_vsnprintf (text, sizeof(text), error, argptr); Q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
trap_Error( va("%s", text) ); trap_Error( text );
} }
void QDECL Com_Printf( const char *msg, ... ) { void QDECL Com_Printf( const char *msg, ... ) {
@ -49,7 +49,7 @@ void QDECL Com_Printf( const char *msg, ... ) {
Q_vsnprintf (text, sizeof(text), msg, argptr); Q_vsnprintf (text, sizeof(text), msg, argptr);
va_end (argptr); va_end (argptr);
trap_Print( va("%s", text) ); trap_Print( text );
} }
/* /*

4
code/ui/ui_atoms.c
View file

@ -37,7 +37,7 @@ void QDECL Com_Error( int level, const char *error, ... ) {
Q_vsnprintf (text, sizeof(text), error, argptr); Q_vsnprintf (text, sizeof(text), error, argptr);
va_end (argptr); va_end (argptr);
trap_Error( va("%s", text) ); trap_Error( text );
} }
void QDECL Com_Printf( const char *msg, ... ) { void QDECL Com_Printf( const char *msg, ... ) {
@ -48,7 +48,7 @@ void QDECL Com_Printf( const char *msg, ... ) {
Q_vsnprintf (text, sizeof(text), msg, argptr); Q_vsnprintf (text, sizeof(text), msg, argptr);
va_end (argptr); va_end (argptr);
trap_Print( va("%s", text) ); trap_Print( text );
} }
qboolean newUI = qfalse; qboolean newUI = qfalse;

12
code/ui/ui_main.c
View file

@ -931,7 +931,7 @@ void UI_LoadMenus(const char *menuFile, qboolean reset) {
Com_Printf( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile ); Com_Printf( S_COLOR_YELLOW "menu file not found: %s, using default\n", menuFile );
handle = trap_PC_LoadSource( "ui/menus.txt" ); handle = trap_PC_LoadSource( "ui/menus.txt" );
if (!handle) { if (!handle) {
trap_Error( va( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!" ) ); trap_Error( S_COLOR_RED "default menu file not found: ui/menus.txt, unable to continue!" );
} }
} }
@ -4472,7 +4472,7 @@ static void UI_FeederSelection(float feederID, int index) {
UI_SelectedHead(index, &actual); UI_SelectedHead(index, &actual);
index = actual; index = actual;
if (index >= 0 && index < uiInfo.characterCount) { if (index >= 0 && index < uiInfo.characterCount) {
trap_Cvar_Set( "team_model", va("%s", uiInfo.characterList[index].base)); trap_Cvar_Set( "team_model", uiInfo.characterList[index].base);
trap_Cvar_Set( "team_headmodel", va("*%s", uiInfo.characterList[index].name)); trap_Cvar_Set( "team_headmodel", va("*%s", uiInfo.characterList[index].name));
updateModel = qtrue; updateModel = qtrue;
} }
@ -4639,11 +4639,11 @@ static qboolean Character_Parse(char **p) {
uiInfo.characterList[uiInfo.characterCount].imageName = String_Alloc(va("models/players/heads/%s/icon_default.tga", uiInfo.characterList[uiInfo.characterCount].name)); uiInfo.characterList[uiInfo.characterCount].imageName = String_Alloc(va("models/players/heads/%s/icon_default.tga", uiInfo.characterList[uiInfo.characterCount].name));
if (tempStr && (!Q_stricmp(tempStr, "female"))) { if (tempStr && (!Q_stricmp(tempStr, "female"))) {
uiInfo.characterList[uiInfo.characterCount].base = String_Alloc(va("Janet")); uiInfo.characterList[uiInfo.characterCount].base = String_Alloc("Janet");
} else if (tempStr && (!Q_stricmp(tempStr, "male"))) { } else if (tempStr && (!Q_stricmp(tempStr, "male"))) {
uiInfo.characterList[uiInfo.characterCount].base = String_Alloc(va("James")); uiInfo.characterList[uiInfo.characterCount].base = String_Alloc("James");
} else { } else {
uiInfo.characterList[uiInfo.characterCount].base = String_Alloc(va("%s",tempStr)); uiInfo.characterList[uiInfo.characterCount].base = String_Alloc(tempStr);
} }
Com_Printf("Loaded %s character %s.\n", uiInfo.characterList[uiInfo.characterCount].base, uiInfo.characterList[uiInfo.characterCount].name); Com_Printf("Loaded %s character %s.\n", uiInfo.characterList[uiInfo.characterCount].base, uiInfo.characterList[uiInfo.characterCount].name);
@ -5554,7 +5554,7 @@ void UI_DrawConnectScreen( qboolean overlay ) {
} }
if (!Q_stricmp(cstate.servername,"localhost")) { if (!Q_stricmp(cstate.servername,"localhost")) {
Text_PaintCenter(centerPoint, yStart + 48, scale, colorWhite, va("Starting up..."), ITEM_TEXTSTYLE_SHADOWEDMORE); Text_PaintCenter(centerPoint, yStart + 48, scale, colorWhite, "Starting up...", ITEM_TEXTSTYLE_SHADOWEDMORE);
} else { } else {
strcpy(text, va("Connecting to %s", cstate.servername)); strcpy(text, va("Connecting to %s", cstate.servername));
Text_PaintCenter(centerPoint, yStart + 48, scale, colorWhite,text , ITEM_TEXTSTYLE_SHADOWEDMORE); Text_PaintCenter(centerPoint, yStart + 48, scale, colorWhite,text , ITEM_TEXTSTYLE_SHADOWEDMORE);