X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommands%2Fcl_cmd.qc;h=631090cc1f9b7d119a2a9847b9d6ee5619cdd568;hb=7069dc3f41678554d089db582ccf16da1f8874a5;hp=6481d6b1d4a61aca30e4b6ff746f39d75ee6830a;hpb=f41d9f31538bef0259d2b2c74536bb977901f99d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 6481d6b1d..127f404e7 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -1,35 +1,40 @@ +#include "cl_cmd.qh" // ============================================== // CSQC client commands code, written by Samual // Last updated: December 28th, 2011 // ============================================== -#include +#include #include "cl_cmd.qh" #include "../autocvars.qh" -#include "../defs.qh" -#include +#include +#include +#include +#include +#include #include "../main.qh" #include "../mapvoting.qh" #include "../miscfunctions.qh" +#include -#include "../mutators/events.qh" +#include -#include +#include -#include +#include void DrawDebugModel(entity this) { 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; } } @@ -40,6 +45,7 @@ void DrawDebugModel(entity this) 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. @@ -52,22 +58,22 @@ void LocalCommand_blurtest(int request) blurtest_time1 = time + stof(argv(1)); blurtest_radius = stof(argv(2)); blurtest_power = stof(argv(3)); - LOG_INFO("Enabled blurtest\n"); + LOG_INFO("Enabled blurtest"); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd blurtest\n"); - LOG_INFO(" No arguments required.\n"); + LOG_HELP("Usage:^3 cl_cmd blurtest"); + LOG_HELP(" No arguments required."); return; } } #else if (request) { - LOG_INFO("Blurtest is not enabled on this client.\n"); + LOG_INFO("Blurtest is not enabled on this client."); return; } #endif @@ -75,6 +81,7 @@ void LocalCommand_blurtest(int request) void LocalCommand_boxparticles(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -89,7 +96,7 @@ void LocalCommand_boxparticles(int request, int argc) 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)); @@ -103,24 +110,24 @@ void LocalCommand_boxparticles(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2boxparticles^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n"); - LOG_INFO(" 'effectname' is the name of a particle effect in effectinfo.txt\n"); - LOG_INFO(" 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n"); - LOG_INFO(" 'org_from' is the starting origin of the box\n"); - LOG_INFO(" 'org_to' is the ending origin of the box\n"); - LOG_INFO(" 'dir_from' is the minimum velocity\n"); - LOG_INFO(" 'dir_to' is the maximum velocity\n"); - LOG_INFO(" 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n"); - LOG_INFO(" 'flags' can contain:\n"); - LOG_INFO(" 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n"); - LOG_INFO(" 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n"); - LOG_INFO(" 4 to respect globals particles_fade (set right before via prvm_globalset client)\n"); - LOG_INFO(" 128 to draw a trail, not a box\n"); + LOG_HELP( + "Usage:^3 cl_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n" + " 'effectname' is the name of a particle effect in effectinfo.txt\n" + " 'own' 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; } } @@ -128,12 +135,14 @@ void LocalCommand_boxparticles(int request, int argc) void LocalCommand_create_scrshot_ent(int 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) { @@ -143,13 +152,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"); - LOG_INFO("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 { - LOG_INFO("^1Error: ^7Could not dump to file!\n"); + LOG_INFO("^1Error: ^7Could not dump to file!"); } return; } @@ -157,8 +166,8 @@ void LocalCommand_create_scrshot_ent(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd create_scrshot_ent\n"); - LOG_INFO(" No arguments required.\n"); + LOG_HELP("Usage:^3 cl_cmd create_scrshot_ent [path]"); + LOG_HELP(" Where 'path' can be the subdirectory of data/data in which the file is saved."); return; } } @@ -166,6 +175,7 @@ void LocalCommand_create_scrshot_ent(int request) void LocalCommand_debugmodel(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -178,6 +188,7 @@ void LocalCommand_debugmodel(int request, int argc) setorigin(debugmodel_entity, view_origin); debugmodel_entity.angles = view_angles; debugmodel_entity.draw = DrawDebugModel; + IL_PUSH(g_drawables, debugmodel_entity); return; } @@ -185,8 +196,8 @@ void LocalCommand_debugmodel(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd debugmodel model\n"); - LOG_INFO(" Where 'model' is a string of the model name to use for the debug model.\n"); + LOG_HELP("Usage:^3 cl_cmd debugmodel model"); + LOG_HELP(" Where 'model' is a string of the model name to use for the debug model."); return; } } @@ -194,6 +205,7 @@ void LocalCommand_debugmodel(int request, int argc) void LocalCommand_handlevote(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -229,30 +241,19 @@ void LocalCommand_handlevote(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2handlevote^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd handlevote vote\n"); - LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name.\n"); + LOG_HELP("Usage:^3 cl_cmd handlevote vote"); + LOG_HELP(" Where 'vote' is the selection for either the current poll or uid2name."); return; } } } -bool QuickMenu_IsOpened(); -void QuickMenu_Close(); -bool QuickMenu_Open(string mode, string submenu); - -bool HUD_MinigameMenu_IsOpened(); -void HUD_MinigameMenu_Close(); -void HUD_MinigameMenu_Open(); - -void HUD_Radar_Show_Maximized(bool doshow, bool clickable); - void LocalCommand_hud(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -272,15 +273,17 @@ void LocalCommand_hud(int request, int argc) { if (argv(2) == "help") { - LOG_INFO(" quickmenu [[default | file | \"\"] submenu]\n"); - LOG_INFO("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.\n"); - LOG_INFO("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option.\n"); + 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 - QuickMenu_Open(argv(2), argv(3)); // mode, submenu + QuickMenu_Open(argv(2), argv(3), file); // mode, submenu return; } @@ -299,13 +302,13 @@ void LocalCommand_hud(int request, int argc) case "scoreboard_columns_set": { - Cmd_HUD_SetFields(argc); + Cmd_Scoreboard_SetFields(argc); return; } case "scoreboard_columns_help": { - Cmd_HUD_Help(); + Cmd_Scoreboard_Help(); return; } @@ -320,24 +323,23 @@ void LocalCommand_hud(int request, int argc) case "clickradar": { - HUD_Radar_Show_Maximized(!hud_panel_radar_mouse, 1); + if(!isdemo()) + HUD_Radar_Show_Maximized(!hud_panel_radar_mouse, 1); return; } } } default: - { - LOG_INFO("Incorrect parameters for ^2hud^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n"); - LOG_INFO(" Where 'action' is the command to complete,\n"); - LOG_INFO(" 'configname' is the name to save to for \"save\" action,\n"); - LOG_INFO(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n"); - LOG_INFO(" and 'layout' is how to organize the scoreboard columns for the set action.\n"); - LOG_INFO(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); + LOG_HELP("Usage:^3 cl_cmd hud action [configname | radartoggle | layout]"); + 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 control hud_panel_radar_maximized for \"radar\" action,"); + LOG_HELP(" and 'layout' is how to organize the scoreboard columns for the set action."); + LOG_HELP(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\""); return; } } @@ -345,25 +347,24 @@ void LocalCommand_hud(int request, int argc) void LocalCommand_localprint(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: { if (argv(1)) { - centerprint_hud(argv(1)); + centerprint_AddStandard(argv(1)); return; } } default: - { - LOG_INFO("Incorrect parameters for ^2localprint^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd localprint \"message\"\n"); - LOG_INFO(" '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; } } @@ -371,6 +372,7 @@ void LocalCommand_localprint(int request, int argc) void LocalCommand_mv_download(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -383,36 +385,11 @@ void LocalCommand_mv_download(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2mv_download^7\n"); - } - case CMD_REQUEST_USAGE: - { - LOG_INFO("\nUsage:^3 cl_cmd mv_download mapid\n"); - LOG_INFO(" 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: - { - FOREACH_ENTITY_CLASS(argv(1), true, LAMBDA(LOG_INFO(etos(it), "\n"))); - return; - } - - default: - { - LOG_INFO("Incorrect parameters for ^2find^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd find classname\n"); - LOG_INFO(" Where 'classname' is the classname to search for.\n"); + LOG_HELP("Usage:^3 cl_cmd mv_download mapid"); + LOG_HELP(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu."); return; } } @@ -420,6 +397,7 @@ void LocalCommand_find(int request, int argc) void LocalCommand_sendcvar(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -427,7 +405,7 @@ void LocalCommand_sendcvar(int request, int argc) 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") @@ -436,19 +414,17 @@ void LocalCommand_sendcvar(int request, int argc) s = W_FixWeaponOrder(W_NumberWeaponOrder(s), 0); localcmd("cmd sentcvar ", thiscvar, " \"", s, "\"\n"); - strunzone(thiscvar); + strfree(thiscvar); return; } } default: - { - LOG_INFO("Incorrect parameters for ^2sendcvar^7\n"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd sendcvar \n"); - LOG_INFO(" 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; } } @@ -469,8 +445,8 @@ void LocalCommand_(int request) default: case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd \n"); - print(" No arguments required.\n"); + LOG_HELP("Usage:^3 cl_cmd "); + LOG_HELP(" No arguments required."); return; } } @@ -490,38 +466,37 @@ CLIENT_COMMAND(debugmodel, "Spawn a debug model manually") { LocalCommand_debugm 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(find, "Search through entities for matching classname") { LocalCommand_find(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 weaponpriority)") { LocalCommand_sendcvar(request, arguments); } +CLIENT_COMMAND(sendcvar, "Send a cvar to the server (like cl_weaponpriority)") { LocalCommand_sendcvar(request, arguments); } void LocalCommand_macro_help() { - FOREACH(CLIENT_COMMANDS, true, LAMBDA(LOG_INFOF(" ^2%s^7: %s\n", it.m_name, it.m_description))); + FOREACH(CLIENT_COMMANDS, true, LOG_HELPF(" ^2%s^7: %s", it.m_name, it.m_description)); } bool LocalCommand_macro_command(int argc, string command) { string c = strtolower(argv(0)); - FOREACH(CLIENT_COMMANDS, it.m_name == c, LAMBDA( - it.m_invokecmd(CMD_REQUEST_COMMAND, NULL, argc, command); + 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) { string c = strtolower(argv(1)); - FOREACH(CLIENT_COMMANDS, it.m_name == c, LAMBDA( - it.m_invokecmd(CMD_REQUEST_USAGE, NULL, argc, ""); + 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) { - FOREACH(CLIENT_COMMANDS, true, LAMBDA(CMD_Write_Alias("qc_cmd_cl", it.m_name, it.m_description))); + FOREACH(CLIENT_COMMANDS, true, CMD_Write_Alias("qc_cmd_cl", it.m_name, it.m_description)); } @@ -543,14 +518,14 @@ void GameCommand(string command) { if (argc == 1) { - LOG_INFO("\nClient console commands:\n"); + LOG_HELP("Client console commands:"); LocalCommand_macro_help(); - LOG_INFO("\nGeneric commands shared by all programs:\n"); + LOG_HELP("\nGeneric commands shared by all programs:"); GenericCommand_macro_help(); - LOG_INFO("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.\n"); - LOG_INFO("For help about a specific command, type cl_cmd help COMMAND\n"); + LOG_HELP("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above."); + LOG_HELP("For help about a specific command, type cl_cmd help COMMAND"); return; } @@ -570,7 +545,7 @@ void GameCommand(string command) ) return; // nothing above caught the command, must be invalid - LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n"); + LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help."); } @@ -580,11 +555,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() \