From d667845777e15d3bdd8e28f1fa3dfd82b63e36fe Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 13 Mar 2023 05:31:27 +0300 Subject: [PATCH] engine: convert Cbuf_AddText with va to Cbuf_AddTextf --- engine/client/cl_gameui.c | 2 +- engine/client/cl_main.c | 2 +- engine/client/cl_parse.c | 2 +- engine/client/in_touch.c | 4 ++-- engine/client/ref_common.c | 2 +- engine/common/host.c | 6 +++--- engine/server/sv_cmds.c | 2 +- engine/server/sv_filter.c | 2 +- engine/server/sv_init.c | 2 +- engine/server/sv_save.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c index d19087c5..c74932fb 100644 --- a/engine/client/cl_gameui.c +++ b/engine/client/cl_gameui.c @@ -838,7 +838,7 @@ send client connect */ static void GAME_EXPORT pfnClientJoin( const netadr_t adr ) { - Cbuf_AddText( va( "connect %s\n", NET_AdrToString( adr ))); + Cbuf_AddTextf( "connect %s\n", NET_AdrToString( adr )); } /* diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 2aad47e1..07c0de43 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -2086,7 +2086,7 @@ void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg ) if( NET_CompareAdr( from, cls.legacyserver )) { - Cbuf_AddText( va( "connect %s legacy\n", NET_AdrToString( from ))); + Cbuf_AddTextf( "connect %s legacy\n", NET_AdrToString( from )); memset( &cls.legacyserver, 0, sizeof( cls.legacyserver )); } } diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index 81f3c46f..016e8cd6 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -2001,7 +2001,7 @@ void CL_ParseExec( sizebuf_t *msg ) COM_FileBase( clgame.mapname, mapname ); if ( COM_CheckString( mapname ) ) - Cbuf_AddText( va( "exec %s.cfg\n", mapname ) ); + Cbuf_AddTextf( "exec %s.cfg\n", mapname ); } } diff --git a/engine/client/in_touch.c b/engine/client/in_touch.c index 7131b6c8..f4d38f15 100644 --- a/engine/client/in_touch.c +++ b/engine/client/in_touch.c @@ -737,7 +737,7 @@ static void Touch_ReloadConfig_f( void ) touch.edit = touch.selection = NULL; touch.resize_finger = touch.move_finger = touch.look_finger = touch.wheel_finger = -1; - Cbuf_AddText( va("exec %s\n", touch_config_file->string ) ); + Cbuf_AddTextf( "exec %s\n", touch_config_file->string ); } static touch_button_t *Touch_AddButton( touchbuttonlist_t *list, @@ -1111,7 +1111,7 @@ static void Touch_InitConfig( void ) //pfnGetScreenInfo( NULL ); //HACK: update hud screen parameters like iHeight if( FS_FileExists( touch_config_file->string, true ) ) { - Cbuf_AddText( va( "exec \"%s\"\n", touch_config_file->string ) ); + Cbuf_AddTextf( "exec \"%s\"\n", touch_config_file->string ); Cbuf_Execute(); } else diff --git a/engine/client/ref_common.c b/engine/client/ref_common.c index a736f51f..9d8ee9b2 100644 --- a/engine/client/ref_common.c +++ b/engine/client/ref_common.c @@ -224,7 +224,7 @@ static qboolean R_DoResetGamma( void ) static qboolean R_Init_Video_( const int type ) { host.apply_opengl_config = true; - Cbuf_AddText( va( "exec %s.cfg", ref.dllFuncs.R_GetConfigName())); + Cbuf_AddTextf( "exec %s.cfg", ref.dllFuncs.R_GetConfigName()); Cbuf_Execute(); host.apply_opengl_config = false; diff --git a/engine/common/host.c b/engine/common/host.c index 8e45bf82..73b367df 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -827,7 +827,7 @@ void Host_Userconfigd_f( void ) for( i = 0; i < t->numfilenames; i++ ) { - Cbuf_AddText( va("exec %s\n", t->filenames[i] ) ); + Cbuf_AddTextf( "exec %s\n", t->filenames[i] ); } Mem_Free( t ); @@ -1221,7 +1221,7 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa Wcon_ShowConsole( false ); // hide console #endif // execute startup config and cmdline - Cbuf_AddText( va( "exec %s.rc\n", SI.rcName )); + Cbuf_AddTextf( "exec %s.rc\n", SI.rcName ); Cbuf_Execute(); if( !host.config_executed ) { @@ -1255,7 +1255,7 @@ int EXPORT Host_Main( int argc, char **argv, const char *progname, int bChangeGa // execute server.cfg after commandline // so we have a chance to set servercfgfile - Cbuf_AddText( va( "exec %s\n", Cvar_VariableString( "servercfgfile" ))); + Cbuf_AddTextf( "exec %s\n", Cvar_VariableString( "servercfgfile" )); Cbuf_Execute(); } diff --git a/engine/server/sv_cmds.c b/engine/server/sv_cmds.c index 8812811d..1eb81d22 100644 --- a/engine/server/sv_cmds.c +++ b/engine/server/sv_cmds.c @@ -394,7 +394,7 @@ void SV_HazardCourse_f( void ) // special case for Gunman Chronicles: playing avi-file if( FS_FileExists( va( "media/%s.avi", GI->trainmap ), false )) { - Cbuf_AddText( va( "wait; movie %s\n", GI->trainmap )); + Cbuf_AddTextf( "wait; movie %s\n", GI->trainmap ); Host_EndGame( true, DEFAULT_ENDGAME_MESSAGE ); } else COM_NewGame( GI->trainmap ); diff --git a/engine/server/sv_filter.c b/engine/server/sv_filter.c index f6eb8df2..ccffeee8 100644 --- a/engine/server/sv_filter.c +++ b/engine/server/sv_filter.c @@ -159,7 +159,7 @@ static void SV_BanID_f( void ) cidfilter = filter; if( cl && !Q_stricmp( Cmd_Argv( Cmd_Argc() - 1 ), "kick" )) - Cbuf_AddText( va( "kick #%d \"Kicked and banned\"\n", cl->userid )); + Cbuf_AddTextf( "kick #%d \"Kicked and banned\"\n", cl->userid ); } static void SV_ListID_f( void ) diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c index 699b47b9..a21d7cdd 100644 --- a/engine/server/sv_init.c +++ b/engine/server/sv_init.c @@ -628,7 +628,7 @@ void SV_ActivateServer( int runPhysics ) const char *cycle = Cvar_VariableString( "mapchangecfgfile" ); if( COM_CheckString( cycle )) - Cbuf_AddText( va( "exec %s\n", cycle )); + Cbuf_AddTextf( "exec %s\n", cycle ); } } diff --git a/engine/server/sv_save.c b/engine/server/sv_save.c index 006e4875..2ea3d7af 100644 --- a/engine/server/sv_save.c +++ b/engine/server/sv_save.c @@ -1739,7 +1739,7 @@ static qboolean SaveGameSlot( const char *pSaveName, const char *pSaveComment ) } // pending the preview image for savegame - Cbuf_AddText( va( "saveshot \"%s\"\n", pSaveName )); + Cbuf_AddTextf( "saveshot \"%s\"\n", pSaveName ); Con_Printf( "Saving game to %s...\n", name ); version = SAVEGAME_VERSION;