diff --git a/engine/client/cl_demo.c b/engine/client/cl_demo.c index 92ebdd2b..089898ed 100644 --- a/engine/client/cl_demo.c +++ b/engine/client/cl_demo.c @@ -1408,7 +1408,7 @@ void CL_PlayDemo_f( void ) if( Cmd_Argc() < 2 ) { - Con_Printf( S_USAGE "playdemo \n" ); + Con_Printf( S_USAGE "%s \n", Cmd_Argv( 0 )); return; } @@ -1535,12 +1535,6 @@ timedemo */ void CL_TimeDemo_f( void ) { - if( Cmd_Argc() != 2 ) - { - Con_Printf( S_USAGE "timedemo \n" ); - return; - } - CL_PlayDemo_f (); // cls.td_starttime will be grabbed at the second frame of the demo, so diff --git a/engine/common/host.c b/engine/common/host.c index 0d607c22..0372c5e5 100644 --- a/engine/common/host.c +++ b/engine/common/host.c @@ -74,7 +74,7 @@ void Sys_PrintUsage( void ) #if XASH_MESSAGEBOX == MSGBOX_STDERR "\n" // dirty hack to not have Xash Error: Usage: on same line #endif // XASH_MESSAGEBOX == MSGBOX_STDERR - "Usage:\n" + S_USAGE "\n" #if !XASH_MOBILE_PLATFORM #if XASH_WIN32 O(".exe [options] [+command1] [+command2 arg]","") diff --git a/engine/server/sv_cmds.c b/engine/server/sv_cmds.c index 571c4ffc..b622d766 100644 --- a/engine/server/sv_cmds.c +++ b/engine/server/sv_cmds.c @@ -249,7 +249,7 @@ void SV_Maps_f( void ) if( Cmd_Argc() != 2 ) { - Msg( "Usage: maps \nmaps * for full listing\n" ); + Msg( S_USAGE "maps \nmaps * for full listing\n" ); return; } diff --git a/engine/server/sv_filter.c b/engine/server/sv_filter.c index fa7164a0..1b60e3b9 100644 --- a/engine/server/sv_filter.c +++ b/engine/server/sv_filter.c @@ -162,7 +162,7 @@ static void SV_BanID_f( void ) if( !id[0] ) { - Con_Reportf( "Usage: banid <#userid or unique id>\n0 minutes for permanent ban\n" ); + Con_Reportf( S_USAGE "banid <#userid or unique id>\n0 minutes for permanent ban\n" ); return; } @@ -259,7 +259,7 @@ static void SV_RemoveID_f( void ) if( !id[0] ) { - Con_Reportf("Usage: removeid <#slotnumber or uniqueid>\n"); + Con_Reportf( S_USAGE "removeid <#slotnumber or uniqueid>\n"); return; } @@ -354,7 +354,7 @@ static void SV_AddIP_f( void ) if( !StringToIP( ipstr, maskstr, &ip, &mask ) ) { - Con_Reportf( "Usage: addip [mask]\n0 minutes for permanent ban\n"); + Con_Reportf( S_USAGE "addip [mask]\n0 minutes for permanent ban\n"); return; } @@ -394,7 +394,7 @@ static void SV_RemoveIP_f( void ) if( !StringToIP( Cmd_Argv(1), Cmd_Argv(2), &ip, &mask ) ) { - Con_Reportf( "Usage: removeip [mask]\n" ); + Con_Reportf( S_USAGE "removeip [mask]\n" ); return; } diff --git a/engine/server/sv_log.c b/engine/server/sv_log.c index 7c1c5d6b..db6c4dfe 100644 --- a/engine/server/sv_log.c +++ b/engine/server/sv_log.c @@ -214,7 +214,7 @@ void SV_ServerLog_f( void ) { if( Cmd_Argc() != 2 ) { - Con_Printf("usage: log < on|off >\n" ); + Con_Printf( S_USAGE "log < on|off >\n" ); if( svs.log.active ) Con_Printf( "currently logging\n" );