X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fcommand%2Fgeneric.qc;h=3ce25e26d71272da71edde5d46f32ae482c7d879;hb=2c943b957e730bc137bfae6404369b3af34b77ce;hp=2cac0b1e5b99be949cf0fd7d3cdf9ed9ceca1787;hpb=791f300d2660d6b75a51c6e7f302d6fa6b64861a;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 2cac0b1e5..3ce25e26d 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -1,24 +1,24 @@ #include "generic.qh" -#include "_mod.qh" -#include "reg.qh" -#include "markup.qh" -#include "rpn.qh" - -#include "../mapinfo.qh" - -#ifdef GAMEQC - #include "../notifications/all.qh" -#endif - -#ifdef CSQC - #include -#endif - -#ifdef SVQC - #include +#if defined(CSQC) + #include + #include + #include + #include + #include + #include + #include +#elif defined(MENUQC) +#elif defined(SVQC) + #include + #include + #include + #include + #include + #include #include #include + #include #endif // ========================================================= @@ -86,12 +86,12 @@ void GenericCommand_addtolist(int request, int argc) } default: - LOG_INFO("Incorrect parameters for ^2addtolist^7"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " addtolist variable value"); - LOG_INFO(" Where 'variable' is what to add 'value' to."); - LOG_INFO("See also: ^2removefromlist^7"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " addtolist "); + LOG_HELP(" Where is the cvar to add to."); + LOG_HELP("See also: ^2removefromlist^7"); return; } } @@ -163,13 +163,13 @@ void GenericCommand_qc_curl(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key N] [--cvar] [--exec] URL [postargs...]"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " qc_curl [--key ] [--cvar] [--exec] []"); return; } } } -GENERIC_COMMAND(dumpcommands, "Dump all commands on the program to _cmd_dump.txt") +GENERIC_COMMAND(dumpcommands, "Dump all commands on the program to _cmd_dump.txt", false) { switch(request) { @@ -222,8 +222,8 @@ GENERIC_COMMAND(dumpcommands, "Dump all commands on the program to _cmd default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpcommands"); - LOG_INFO(" No arguments required."); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpcommands"); + LOG_HELP(" No arguments required."); return; } } @@ -274,11 +274,13 @@ void GenericCommand_maplist(int request, int argc) { if(argc == 3) { + // save argv(2) from being overridden by tokenize engine call + string del_map_name = argv(2); argc = tokenizebyseparator(cvar_string("g_maplist"), " "); tmp_string = ""; for(i = 0; i < argc; ++i) - if(argv(i) != argv(2)) + if(argv(i) != del_map_name) tmp_string = strcat(tmp_string, " ", argv(i)); tmp_string = substring(tmp_string, 1, strlen(tmp_string) - 1); @@ -300,13 +302,13 @@ void GenericCommand_maplist(int request, int argc) } default: - LOG_INFO("Incorrect parameters for ^2maplist^7"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " maplist action [map]"); - LOG_INFO(" Where 'action' is the command to complete,"); - LOG_INFO(" and 'map' is what it acts upon (if required)."); - LOG_INFO(" Full list of commands here: \"add, cleanup, remove, shuffle.\""); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " maplist []"); + LOG_HELP(" Where is the command to complete,"); + LOG_HELP(" and is what it acts upon (for the 'add' and 'remove' actions)."); + LOG_HELP(" Full list of commands here: add, cleanup, remove, shuffle."); return; } } @@ -325,8 +327,8 @@ void GenericCommand_nextframe(int request, string command) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " nextframe command..."); - LOG_INFO(" Where command will be executed next frame of this VM"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " nextframe "); + LOG_HELP(" Where will be executed next frame of this VM"); return; } } @@ -356,12 +358,12 @@ void GenericCommand_removefromlist(int request, int argc) } default: - LOG_INFO("Incorrect parameters for ^2removefromlist^7"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value"); - LOG_INFO(" Where 'variable' is what cvar to remove 'value' from."); - LOG_INFO("See also: ^2addtolist^7"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist "); + LOG_HELP(" Where is the cvar to remove from."); + LOG_HELP("See also: ^2addtolist^7"); return; } } @@ -374,16 +376,25 @@ void GenericCommand_restartnotifs(int request) case CMD_REQUEST_COMMAND: { #ifdef GAMEQC - int NOTIF_ANNCE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE, { ++NOTIF_ANNCE_COUNT; }); - int NOTIF_INFO_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_INFO, { ++NOTIF_INFO_COUNT; }); - int NOTIF_CENTER_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER, { ++NOTIF_CENTER_COUNT; }); - int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; }); - int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; }); + int NOTIF_ANNCE_COUNT = 0; + int NOTIF_INFO_COUNT = 0; + int NOTIF_CENTER_COUNT = 0; + int NOTIF_MULTI_COUNT = 0; + int NOTIF_CHOICE_COUNT = 0; + FOREACH(Notifications, true, { + switch (it.nent_type) + { + case MSG_ANNCE: ++NOTIF_ANNCE_COUNT; break; + case MSG_INFO: ++NOTIF_INFO_COUNT; break; + case MSG_CENTER: ++NOTIF_CENTER_COUNT; break; + case MSG_MULTI: ++NOTIF_MULTI_COUNT; break; + case MSG_CHOICE: ++NOTIF_CHOICE_COUNT; break; + } + }); + LOG_INFOF( - ( - "Restart_Notifications(): Restarting %d notifications... " - "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d" - ), + "Restart_Notifications(): Restarting %d notifications... " + "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d", ( NOTIF_ANNCE_COUNT + NOTIF_INFO_COUNT + @@ -400,7 +411,7 @@ void GenericCommand_restartnotifs(int request) Destroy_All_Notifications(); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); #else - LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd.")); + LOG_INFO("Notification restart command only works with cl_cmd and sv_cmd."); #endif return; } @@ -408,8 +419,8 @@ void GenericCommand_restartnotifs(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " restartnotifs"); - LOG_INFO(" No arguments required."); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " restartnotifs"); + LOG_HELP(" No arguments required."); return; } } @@ -435,12 +446,12 @@ void GenericCommand_settemp(int request, int argc) } default: - LOG_INFO("Incorrect parameters for ^2settemp^7"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\""); - LOG_INFO(" Where 'cvar' is the cvar you want to temporarily set with 'arguments'."); - LOG_INFO("See also: ^2settemp_restore^7"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"\""); + LOG_HELP(" Where is the cvar you want to temporarily set with ."); + LOG_HELP("See also: ^2settemp_restore^7"); return; } } @@ -465,9 +476,9 @@ void GenericCommand_settemp_restore(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp_restore"); - LOG_INFO(" No arguments required."); - LOG_INFO("See also: ^2settemp^7"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " settemp_restore"); + LOG_HELP(" No arguments required."); + LOG_HELP("See also: ^2settemp^7"); return; } } @@ -493,7 +504,7 @@ void GenericCommand_runtest(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " [function to run]"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " "); return; } } @@ -514,8 +525,8 @@ void GenericCommand_(int request) default: case CMD_REQUEST_USAGE: { - print(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " ")); - print(" No arguments required.\n"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " "); + LOG_HELP(" No arguments required."); return; } } @@ -523,20 +534,20 @@ void GenericCommand_(int request) */ // Do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -GENERIC_COMMAND(addtolist, "Add a string to a cvar") { GenericCommand_addtolist(request, arguments); } -GENERIC_COMMAND(maplist, "Automatic control of maplist") { GenericCommand_maplist(request, arguments); } -GENERIC_COMMAND(nextframe, "Execute the given command next frame of this VM") { GenericCommand_nextframe(request, command); } -GENERIC_COMMAND(qc_curl, "Queries a URL") { GenericCommand_qc_curl(request, arguments); } -GENERIC_COMMAND(removefromlist, "Remove a string from a cvar") { GenericCommand_removefromlist(request, arguments); } -GENERIC_COMMAND(restartnotifs, "Re-initialize all notifications") { GenericCommand_restartnotifs(request); } -GENERIC_COMMAND(rpn, "RPN calculator") { GenericCommand_rpn(request, arguments, command); } -GENERIC_COMMAND(settemp, "Temporarily set a value to a cvar which is restored later") { GenericCommand_settemp(request, arguments); } -GENERIC_COMMAND(settemp_restore, "Restore all cvars set by settemp command") { GenericCommand_settemp_restore(request); } -GENERIC_COMMAND(runtest, "Run unit tests") { GenericCommand_runtest(request, arguments); } +GENERIC_COMMAND(addtolist, "Add a string to a cvar", true) { GenericCommand_addtolist(request, arguments); } +GENERIC_COMMAND(maplist, "Automatic control of maplist", true) { GenericCommand_maplist(request, arguments); } +GENERIC_COMMAND(nextframe, "Execute the given command next frame of this VM", true) { GenericCommand_nextframe(request, command); } +GENERIC_COMMAND(qc_curl, "Queries a URL", true) { GenericCommand_qc_curl(request, arguments); } +GENERIC_COMMAND(removefromlist, "Remove a string from a cvar", true) { GenericCommand_removefromlist(request, arguments); } +GENERIC_COMMAND(restartnotifs, "Re-initialize all notifications", false) { GenericCommand_restartnotifs(request); } +GENERIC_COMMAND(rpn, "RPN calculator", true) { GenericCommand_rpn(request, arguments, command); } +GENERIC_COMMAND(settemp, "Temporarily set a value to a cvar which is restored later", false) { GenericCommand_settemp(request, arguments); } +GENERIC_COMMAND(settemp_restore, "Restore all cvars set by settemp command", false) { GenericCommand_settemp_restore(request); } +GENERIC_COMMAND(runtest, "Run unit tests", false) { GenericCommand_runtest(request, arguments); } void GenericCommand_macro_help() { - FOREACH(GENERIC_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s", it.m_name, it.m_description)); + FOREACH(GENERIC_COMMANDS, true, LOG_HELPF(" ^2%s^7: %s", it.m_name, it.m_description)); } float GenericCommand_macro_command(int argc, string command)