X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommand%2Fcl_cmd.qc;h=2df0b83724bae31a65b592694abf580290a8addf;hb=939744d4779ea02689725129337e74ea12993f0c;hp=9fe33a4fc00cf06d88bc51a93c45d1a20c5f72b0;hpb=2718fac2d710f2c4e63a6de3cfe0ffc66dc7d6a3;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc index 9fe33a4fc..2df0b8372 100644 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@ -1,36 +1,34 @@ +#include "cl_cmd.qh" + // ============================================== // CSQC client commands code, written by Samual // Last updated: December 28th, 2011 // ============================================== -#include "../../common/command/command.qh" -#include "cl_cmd.qh" - -#include "../autocvars.qh" -#include "../defs.qh" -#include "../hud.qh" -#include "../hud_config.qh" -#include "../main.qh" -#include "../mapvoting.qh" -#include "../miscfunctions.qh" - -#include "../mutators/events.qh" - -#include "../../common/mapinfo.qh" - -#include "../../common/command/generic.qh" - -void DrawDebugModel() +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +void DrawDebugModel(entity this) { - if(time - floor(time) > 0.5) + if (time - floor(time) > 0.5) { - PolyDrawModel(self); - self.drawmask = 0; + PolyDrawModel(this); + this.drawmask = 0; } else { - self.renderflags = 0; - self.drawmask = MASK_NORMAL; + this.renderflags = 0; + this.drawmask = MASK_NORMAL; } } @@ -41,11 +39,12 @@ void DrawDebugModel() void LocalCommand_blurtest(int request) { + TC(int, request); // Simple command to work with postprocessing temporarily... possibly completely pointless, the glsl shader is used for a real feature now... // Anyway, to enable it, just compile the client with -DBLURTEST and then you can use the command. #ifdef BLURTEST - switch(request) + switch (request) { case CMD_REQUEST_COMMAND: { @@ -53,22 +52,22 @@ void LocalCommand_blurtest(int request) blurtest_time1 = time + stof(argv(1)); blurtest_radius = stof(argv(2)); blurtest_power = stof(argv(3)); - print("Enabled blurtest\n"); + LOG_INFO("Enabled blurtest"); return; } default: case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd blurtest\n"); - print(" No arguments required.\n"); + LOG_HELP("Usage:^3 cl_cmd blurtest"); + LOG_HELP(" No arguments required."); return; } } #else - if(request) + if (request) { - print("Blurtest is not enabled on this client.\n"); + LOG_INFO("Blurtest is not enabled on this client."); return; } #endif @@ -76,21 +75,22 @@ void LocalCommand_blurtest(int request) void LocalCommand_boxparticles(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { if (argc == 9) { - int effect = particleeffectnum(argv(1)); + int effect = _particleeffectnum(argv(1)); if (effect >= 0) { int index = stoi(argv(2)); entity own; - if(index <= 0) + if (index <= 0) own = entitybyindex(-index); else - own = findfloat(world, entnum, index); + own = findfloat(NULL, entnum, index); vector org_from = stov(argv(3)); vector org_to = stov(argv(4)); vector dir_from = stov(argv(5)); @@ -104,22 +104,24 @@ void LocalCommand_boxparticles(int request, int argc) } default: - print("Incorrect parameters for ^2boxparticles^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n"); - print(" 'effectname' is the name of a particle effect in effectinfo.txt\n"); - print(" 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n"); - print(" 'org_from' is the starting origin of the box\n"); - print(" 'org_to' is the ending origin of the box\n"); - print(" 'dir_from' is the minimum velocity\n"); - print(" 'dir_to' is the maximum velocity\n"); - print(" 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n"); - print(" 'flags' can contain:\n"); - print(" 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n"); - print(" 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n"); - print(" 4 to respect globals particles_fade (set right before via prvm_globalset client)\n"); - print(" 128 to draw a trail, not a box\n"); + LOG_HELP( + "Usage:^3 cl_cmd boxparticles \n" + " 'effectname' is the name of a particle effect in effectinfo.txt\n" + " 'owner' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n" + " 'org_from' is the starting origin of the box\n" + " 'org_to' is the ending origin of the box\n" + " 'dir_from' is the minimum velocity\n" + " 'dir_to' is the maximum velocity\n" + " 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n" + " 'flags' can contain:\n" + " 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n" + " 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n" + " 4 to respect globals particles_fade (set right before via prvm_globalset client)\n" + " 128 to draw a trail, not a box" + ); return; } } @@ -127,14 +129,16 @@ void LocalCommand_boxparticles(int request, int argc) void LocalCommand_create_scrshot_ent(int request) { - switch(request) + TC(int, request); + switch (request) { case CMD_REQUEST_COMMAND: { - string filename = strcat(MapInfo_Map_bspname, "_scrshot_ent.txt"); - int fh = fopen(filename, FILE_WRITE); + string path = ((argv(1) == "") ? "" : strcat(argv(1), "/")); + string filename = strcat(path, MapInfo_Map_bspname, "_scrshot_ent.txt"); + int fh = fopen(filename, FILE_APPEND); - if(fh >= 0) + if (fh >= 0) { fputs(fh, "{\n"); fputs(fh, strcat("\"classname\" \"info_autoscreenshot\"\n")); @@ -142,13 +146,13 @@ void LocalCommand_create_scrshot_ent(int request) fputs(fh, strcat("\"angles\" \"", strcat(ftos(view_angles.x), " ", ftos(view_angles.y), " ", ftos(view_angles.z)), "\"\n")); fputs(fh, "}\n"); - print("Completed screenshot entity dump in ^2data/data/", MapInfo_Map_bspname, "_scrshot_ent.txt^7.\n"); + LOG_INFO("Completed screenshot entity dump in ^2data/data/", path, MapInfo_Map_bspname, "_scrshot_ent.txt^7."); fclose(fh); } else { - print("^1Error: ^7Could not dump to file!\n"); + LOG_INFO("^1Error: ^7Could not dump to file!"); } return; } @@ -156,8 +160,8 @@ void LocalCommand_create_scrshot_ent(int request) default: case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd create_scrshot_ent\n"); - print(" No arguments required.\n"); + LOG_HELP("Usage:^3 cl_cmd create_scrshot_ent []"); + LOG_HELP(" Where 'path' can be the subdirectory of data/data in which the file is saved."); return; } } @@ -165,20 +169,20 @@ void LocalCommand_create_scrshot_ent(int request) void LocalCommand_debugmodel(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { string modelname = argv(1); - entity debugmodel_entity; - debugmodel_entity = spawn(); + entity debugmodel_entity = new(debugmodel); precache_model(modelname); - setmodel(debugmodel_entity, modelname); + _setmodel(debugmodel_entity, modelname); setorigin(debugmodel_entity, view_origin); debugmodel_entity.angles = view_angles; debugmodel_entity.draw = DrawDebugModel; - debugmodel_entity.classname = "debugmodel"; + IL_PUSH(g_drawables, debugmodel_entity); return; } @@ -186,8 +190,8 @@ void LocalCommand_debugmodel(int request, int argc) default: case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd debugmodel model\n"); - print(" Where 'model' is a string of the model name to use for the debug model.\n"); + LOG_HELP("Usage:^3 cl_cmd debugmodel "); + LOG_HELP(" Where 'model' is a string of the model name to use for the debug model."); return; } } @@ -195,14 +199,15 @@ void LocalCommand_debugmodel(int request, int argc) void LocalCommand_handlevote(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { int vote_selection; string vote_string; - if(InterpretBoolean(argv(1))) + if (InterpretBoolean(argv(1))) { vote_selection = 2; vote_string = "yes"; @@ -213,9 +218,9 @@ void LocalCommand_handlevote(int request, int argc) vote_string = "no"; } - if(vote_selection) + if (vote_selection) { - if(uid2name_dialog) // handled by "uid2name" option + if (uid2name_dialog) // handled by "uid2name" option { vote_active = 0; vote_prev = 0; @@ -230,11 +235,11 @@ void LocalCommand_handlevote(int request, int argc) } default: - print("Incorrect parameters for ^2handlevote^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd handlevote vote\n"); - print(" Where 'vote' is the selection for either the current poll or uid2name.\n"); + LOG_HELP("Usage:^3 cl_cmd handlevote "); + LOG_HELP(" Where 'vote' is the selection for either the current poll or uid2name."); return; } } @@ -242,11 +247,15 @@ void LocalCommand_handlevote(int request, int argc) void LocalCommand_hud(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { - switch(argv(1)) + if(MUTATOR_CALLHOOK(HUD_Command, argc)) + return; + + switch (argv(1)) { case "configure": { @@ -254,67 +263,77 @@ void LocalCommand_hud(int request, int argc) return; } - case "minigame": + case "quickmenu": { - if(HUD_MinigameMenu_IsOpened()) - HUD_MinigameMenu_Close(); + if (argv(2) == "help") + { + LOG_HELP(" quickmenu [[default | file | \"\"] submenu file]"); + LOG_HELP("Called without options (or with \"\") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename."); + LOG_HELP("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option."); + LOG_HELP("A file name can also be given to open a different quickmenu"); + return; + } + string file = ((argv(4) == "") ? autocvar_hud_panel_quickmenu_file : argv(4)); + if (QuickMenu_IsOpened()) + QuickMenu_Close(); else - HUD_MinigameMenu_Open(); + QuickMenu_Open(argv(2), argv(3), file); // mode, submenu return; } case "save": { - if(argv(2)) + if (argv(2)) { HUD_Panel_ExportCfg(argv(2)); return; } else { - break; // go to usage, we're missing the paramater needed here. + break; // go to usage, we're missing the paramater needed here. } } case "scoreboard_columns_set": { - Cmd_HUD_SetFields(argc); + Cmd_Scoreboard_SetFields(argc); return; } case "scoreboard_columns_help": { - Cmd_HUD_Help(); + Cmd_Scoreboard_Help(); return; } case "radar": { - if(argv(2)) - HUD_Radar_Show_Maximized(InterpretBoolean(argv(2)),0); + if (argv(2)) + HUD_Radar_Show_Maximized(InterpretBoolean(argv(2)), 0); else - HUD_Radar_Show_Maximized(!hud_panel_radar_maximized,0); + HUD_Radar_Show_Maximized(!hud_panel_radar_maximized, 0); return; } case "clickradar": { - HUD_Radar_Show_Maximized(!hud_panel_radar_mouse,1); + if(!isdemo()) + HUD_Radar_Show_Maximized(!hud_panel_radar_mouse, 1); return; } } } default: - print("Incorrect parameters for ^2hud^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n"); - print(" Where 'action' is the command to complete,\n"); - print(" 'configname' is the name to save to for \"save\" action,\n"); - print(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n"); - print(" and 'layout' is how to organize the scoreboard columns for the set action.\n"); - print(" Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); + LOG_HELP("Usage:^3 cl_cmd hud [ | | ]"); + LOG_HELP(" Where 'action' is the command to complete,"); + LOG_HELP(" 'configname' is the name to save to for \"save\" action,"); + LOG_HELP(" 'radartoggle' is to maximize/minimize radar for \"radar\" action,"); + LOG_HELP(" and 'layout' is how to organize the scoreboard columns for \"scoreboard_columns_set\" action."); + LOG_HELP(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\""); return; } } @@ -322,23 +341,24 @@ void LocalCommand_hud(int request, int argc) void LocalCommand_localprint(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1)) + if (argv(1)) { - centerprint_hud(argv(1)); + centerprint_AddStandard(argv(1)); return; } } default: - print("Incorrect parameters for ^2localprint^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd localprint \"message\"\n"); - print(" 'message' is the centerprint message to send to yourself.\n"); + LOG_HELP("Usage:^3 cl_cmd localprint \"message\""); + LOG_HELP(" 'message' is the centerprint message to send to yourself."); return; } } @@ -346,11 +366,12 @@ void LocalCommand_localprint(int request, int argc) void LocalCommand_mv_download(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1)) + if (argv(1)) { Cmd_MapVote_MapDownload(argc); return; @@ -358,36 +379,11 @@ void LocalCommand_mv_download(int request, int argc) } default: - print("Incorrect parameters for ^2mv_download^7\n"); - case CMD_REQUEST_USAGE: - { - print("\nUsage:^3 cl_cmd mv_download mapid\n"); - print(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n"); - return; - } - } -} - -void LocalCommand_find(int request, int argc) -{ - switch(request) - { - case CMD_REQUEST_COMMAND: - { - entity client; - - for(client = world; (client = find(client, classname, argv(1))); ) - print(etos(client), "\n"); - - return; - } - - default: - print("Incorrect parameters for ^2find^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd find classname\n"); - print(" Where 'classname' is the classname to search for.\n"); + LOG_HELP("Usage:^3 cl_cmd mv_download "); + LOG_HELP(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu."); return; } } @@ -395,33 +391,34 @@ void LocalCommand_find(int request, int argc) void LocalCommand_sendcvar(int request, int argc) { - switch(request) + TC(int, request); TC(int, argc); + switch (request) { case CMD_REQUEST_COMMAND: { - if(argv(1)) + if (argv(1)) { // W_FixWeaponOrder will trash argv, so save what we need. - string thiscvar = strzone(argv(1)); + string thiscvar = string_null; strcpy(thiscvar, argv(1)); string s = cvar_string(thiscvar); - if(thiscvar == "cl_weaponpriority") + if (thiscvar == "cl_weaponpriority") s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 1); - else if(substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18) + else if (substring(thiscvar, 0, 17) == "cl_weaponpriority" && strlen(thiscvar) == 18) s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0); localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n"); - strunzone(thiscvar); + strfree(thiscvar); return; } } default: - print("Incorrect parameters for ^2sendcvar^7\n"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd sendcvar \n"); - print(" Where 'cvar' is the cvar plus arguments to send to the server.\n"); + LOG_HELP("Usage:^3 cl_cmd sendcvar "); + LOG_HELP(" Where 'cvar' is the cvar to send to the server."); return; } } @@ -431,22 +428,22 @@ void LocalCommand_sendcvar(int request, int argc) ** ADD ALL NEW COMMANDS TO commands.cfg WITH PROPER ALIASES IN THE SAME FASHION! void LocalCommand_(int request) { - switch(request) - { - case CMD_REQUEST_COMMAND: - { - - return; - } - - default: - case CMD_REQUEST_USAGE: - { - print("\nUsage:^3 cl_cmd \n"); - print(" No arguments required.\n"); - return; - } - } + switch(request) + { + case CMD_REQUEST_COMMAND: + { + + return; + } + + default: + case CMD_REQUEST_USAGE: + { + LOG_HELP("Usage:^3 cl_cmd "); + LOG_HELP(" No arguments required."); + return; + } + } } */ @@ -456,61 +453,44 @@ void LocalCommand_(int request) // ================================== // Normally do not hard code aliases for these, instead create them in commands.cfg... also: keep in alphabetical order, please ;) -#define CLIENT_COMMANDS(request,arguments) \ - CLIENT_COMMAND("blurtest", LocalCommand_blurtest(request), "Feature for testing blur postprocessing") \ - CLIENT_COMMAND("boxparticles", LocalCommand_boxparticles(request, arguments), "Spawn particles manually") \ - CLIENT_COMMAND("create_scrshot_ent", LocalCommand_create_scrshot_ent(request), "Create an entity at this location for automatic screenshots") \ - CLIENT_COMMAND("debugmodel", LocalCommand_debugmodel(request, arguments), "Spawn a debug model manually") \ - CLIENT_COMMAND("handlevote", LocalCommand_handlevote(request, arguments), "System to handle selecting a vote or option") \ - CLIENT_COMMAND("hud", LocalCommand_hud(request, arguments), "Commands regarding/controlling the HUD system") \ - CLIENT_COMMAND("localprint", LocalCommand_localprint(request, arguments), "Create your own centerprint sent to yourself") \ - CLIENT_COMMAND("find", LocalCommand_find(request, arguments), "Search through entities for matching classname") \ - CLIENT_COMMAND("mv_download", LocalCommand_mv_download(request, arguments), "Retrieve mapshot picture from the server") \ - CLIENT_COMMAND("sendcvar", LocalCommand_sendcvar(request, arguments), "Send a cvar to the server (like weaponpriority)") \ - /* nothing */ +CLIENT_COMMAND(blurtest, "Feature for testing blur postprocessing") { LocalCommand_blurtest(request); } +CLIENT_COMMAND(boxparticles, "Spawn particles manually") { LocalCommand_boxparticles(request, arguments); } +CLIENT_COMMAND(create_scrshot_ent, "Create an entity at this location for automatic screenshots") { LocalCommand_create_scrshot_ent(request); } +CLIENT_COMMAND(debugmodel, "Spawn a debug model manually") { LocalCommand_debugmodel(request, arguments); } +CLIENT_COMMAND(handlevote, "System to handle selecting a vote or option") { LocalCommand_handlevote(request, arguments); } +CLIENT_COMMAND(hud, "Commands regarding/controlling the HUD system") { LocalCommand_hud(request, arguments); } +CLIENT_COMMAND(localprint, "Create your own centerprint sent to yourself") { LocalCommand_localprint(request, arguments); } +CLIENT_COMMAND(mv_download, "Retrieve mapshot picture from the server") { LocalCommand_mv_download(request, arguments); } +CLIENT_COMMAND(sendcvar, "Send a cvar to the server (like cl_weaponpriority)") { LocalCommand_sendcvar(request, arguments); } void LocalCommand_macro_help() { - #define CLIENT_COMMAND(name,function,description) \ - { if(strtolower(description) != "") { print(" ^2", name, "^7: ", description, "\n"); } } - - CLIENT_COMMANDS(0, 0); - #undef CLIENT_COMMAND - - return; + FOREACH(CLIENT_COMMANDS, true, LOG_HELPF(" ^2%s^7: %s", it.m_name, it.m_description)); } -bool LocalCommand_macro_command(int argc) +bool LocalCommand_macro_command(int argc, string command) { - #define CLIENT_COMMAND(name,function,description) \ - { if(name == strtolower(argv(0))) { function; return true; } } - - CLIENT_COMMANDS(CMD_REQUEST_COMMAND, argc); - #undef CLIENT_COMMAND - + string c = strtolower(argv(0)); + FOREACH(CLIENT_COMMANDS, it.m_name == c, { + it.m_invokecmd(it, CMD_REQUEST_COMMAND, NULL, argc, command); + return true; + }); return false; } bool LocalCommand_macro_usage(int argc) { - #define CLIENT_COMMAND(name,function,description) \ - { if(name == strtolower(argv(1))) { function; return true; } } - - CLIENT_COMMANDS(CMD_REQUEST_USAGE, argc); - #undef CLIENT_COMMAND - + string c = strtolower(argv(1)); + FOREACH(CLIENT_COMMANDS, it.m_name == c, { + it.m_invokecmd(it, CMD_REQUEST_USAGE, NULL, argc, ""); + return true; + }); return false; } void LocalCommand_macro_write_aliases(int fh) { - #define CLIENT_COMMAND(name,function,description) \ - { if(strtolower(description) != "") { CMD_Write_Alias("qc_cmd_cl", name, description); } } - - CLIENT_COMMANDS(0, 0); - #undef CLIENT_COMMAND - - return; + FOREACH(CLIENT_COMMANDS, true, CMD_Write_Alias("qc_cmd_cl", it.m_name, it.m_description)); } @@ -530,38 +510,36 @@ void GameCommand(string command) string s = strtolower(argv(0)); if (s == "help") { - if(argc == 1) + if (argc == 1) { - print("\nClient console commands:\n"); + LOG_HELP("Client console commands:"); LocalCommand_macro_help(); - print("\nGeneric commands shared by all programs:\n"); + LOG_HELP("\nGeneric commands shared by all programs:"); GenericCommand_macro_help(); - print("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.\n"); - print("For help about a specific command, type cl_cmd help COMMAND\n"); + LOG_HELP("\nUsage:^3 cl_cmd ^7, where possible commands are listed above."); + LOG_HELP("For help about a specific command, type cl_cmd help "); return; } - else if(GenericCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it + else if (GenericCommand_macro_usage(argc)) // Instead of trying to call a command, we're going to see detailed information about it { return; } - else if(LocalCommand_macro_usage(argc)) // now try for normal commands too + else if (LocalCommand_macro_usage(argc)) // now try for normal commands too { return; } } // continue as usual and scan for normal commands - if (GenericCommand(command)// handled by common/command/generic.qc - || LocalCommand_macro_command(argc) // handled by one of the above LocalCommand_* functions - || MUTATOR_CALLHOOK(CSQC_ConsoleCommand, s, argc, command) // handled by a mutator - ) return; + if (GenericCommand(command) // handled by common/command/generic.qc + || LocalCommand_macro_command(argc, command) // handled by one of the above LocalCommand_* functions + || MUTATOR_CALLHOOK(CSQC_ConsoleCommand, s, argc, command) // handled by a mutator + ) return; // nothing above caught the command, must be invalid - print(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n"); - - return; + LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help."); } @@ -571,11 +549,12 @@ void GameCommand(string command) // These functions are here specifically to add special + - commands to the game, and are not really normal commands. // Please add client commands to the function above this, as this is only for special reasons. +// NOTE: showaccuracy is kept as legacy command #define CONSOLE_COMMANDS_NORMAL() \ CONSOLE_COMMAND("+showscores", { scoreboard_showscores = true; }) \ CONSOLE_COMMAND("-showscores", { scoreboard_showscores = false; }) \ - CONSOLE_COMMAND("+showaccuracy", { scoreboard_showaccuracy = true; }) \ - CONSOLE_COMMAND("-showaccuracy", { scoreboard_showaccuracy = false; }) \ + CONSOLE_COMMAND("+showaccuracy", { }) \ + CONSOLE_COMMAND("-showaccuracy", { }) \ /* nothing */ #define CONSOLE_COMMANDS_MOVEMENT() \ @@ -600,7 +579,7 @@ void GameCommand(string command) void ConsoleCommand_macro_init() { // first init normal commands - #define CONSOLE_COMMAND(name,execution) \ + #define CONSOLE_COMMAND(name, execution) \ { registercommand(name); } CONSOLE_COMMANDS_NORMAL(); @@ -608,22 +587,22 @@ void ConsoleCommand_macro_init() // then init movement commands #ifndef CAMERATEST - if(isdemo()) + if (isdemo()) { #endif - #define CONSOLE_COMMAND(name,execution) \ - { registercommand(name); } + #define CONSOLE_COMMAND(name, execution) \ + registercommand(name); - CONSOLE_COMMANDS_MOVEMENT(); + CONSOLE_COMMANDS_MOVEMENT(); #undef CONSOLE_COMMAND #ifndef CAMERATEST - } +} #endif } bool ConsoleCommand_macro_normal(string s, int argc) { - #define CONSOLE_COMMAND(name,execution) \ + #define CONSOLE_COMMAND(name, execution) \ { if (name == s) { { execution } return true; } } CONSOLE_COMMANDS_NORMAL(); @@ -634,9 +613,9 @@ bool ConsoleCommand_macro_normal(string s, int argc) bool ConsoleCommand_macro_movement(string s, int argc) { - if(camera_active) + if (camera_active) { - #define CONSOLE_COMMAND(name,execution) \ + #define CONSOLE_COMMAND(name, execution) \ { if (name == s) { { execution } return true; } } CONSOLE_COMMANDS_MOVEMENT(); @@ -657,7 +636,7 @@ bool CSQC_ConsoleCommand(string command) int argc = tokenize_console(command); string s = strtolower(argv(0)); // Return value should be true if CSQC handled the command, otherwise return false to have the engine handle it. - return (ConsoleCommand_macro_normal(s, argc) - || ConsoleCommand_macro_movement(s, argc) - ); + return ConsoleCommand_macro_normal(s, argc) + || ConsoleCommand_macro_movement(s, argc) + ; }