From 2579738256d5b888e849ce82352ac51438643543 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 18 Jun 2012 16:36:21 +0000 Subject: [PATCH] Removed unneeded va() and use CG_Error instead of trap_Error in cgame. Found by Ensiform. --- code/cgame/cg_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index b923f816..0d8e3188 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -1442,13 +1442,13 @@ void CG_LoadMenus(const char *menuFile) { Com_Printf( S_COLOR_YELLOW "menu file not found: %s, using default\n", 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!" ) ); + CG_Error( S_COLOR_RED "default menu file not found: ui/hud.txt, unable to continue!" ); } } if ( len >= MAX_MENUDEFFILE ) { trap_FS_FCloseFile( f ); - trap_Error( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", menuFile, len, MAX_MENUDEFFILE ) ); + CG_Error( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", menuFile, len, MAX_MENUDEFFILE ); return; }