X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fcommands%2Fcl_cmd.qc;h=0e4fad5294ae9630a5930a0175648eb13e27b80e;hb=7b0ab90eed0d906196c43aa023d5bee56d91e9c4;hp=63e0c56126f7394c8ffd8eacbab9a9d194a229c6;hpb=201f6309c92217b63dc34daf004fbb7424096eca;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 63e0c5612..0e4fad529 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -1,35 +1,34 @@ +#include "cl_cmd.qh" // ============================================== // CSQC client commands code, written by Samual // Last updated: December 28th, 2011 // ============================================== -#include "../../common/command/command.qh" +#include #include "cl_cmd.qh" #include "../autocvars.qh" #include "../defs.qh" -#include "../hud/all.qh" +#include #include "../main.qh" #include "../mapvoting.qh" #include "../miscfunctions.qh" #include "../mutators/events.qh" -#include "../../common/mapinfo.qh" - -#include "../../common/command/generic.qh" +#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 +39,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. @@ -75,6 +75,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 +90,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)); @@ -128,12 +129,13 @@ 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); + int fh = fopen(filename, FILE_APPEND); if (fh >= 0) { @@ -166,6 +168,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 +181,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; } @@ -194,6 +198,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: @@ -243,20 +248,24 @@ void LocalCommand_handlevote(int request, int argc) bool QuickMenu_IsOpened(); void QuickMenu_Close(); -bool QuickMenu_Open(string mode, string submenu); +bool QuickMenu_Open(string mode, string submenu, string file); bool HUD_MinigameMenu_IsOpened(); -void HUD_MinigameMenu_Close(); +void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger); 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: { + if(MUTATOR_CALLHOOK(HUD_Command, argc)) + return; + switch (argv(1)) { case "configure": @@ -269,24 +278,17 @@ void LocalCommand_hud(int request, int argc) { if (argv(2) == "help") { - LOG_INFO(" quickmenu [[default | file | \"\"] submenu]\n"); + LOG_INFO(" quickmenu [[default | file | \"\"] submenu file]\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_INFO("A file name can also be given to open a different quickmenu\n"); 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 - return; - } - - case "minigame": - { - if (HUD_MinigameMenu_IsOpened()) - HUD_MinigameMenu_Close(); - else - HUD_MinigameMenu_Open(); + QuickMenu_Open(argv(2), argv(3), file); // mode, submenu return; } @@ -305,13 +307,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; } @@ -351,6 +353,7 @@ 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: @@ -377,6 +380,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: @@ -401,35 +405,9 @@ void LocalCommand_mv_download(int request, int argc) } } -void LocalCommand_find(int request, int argc) -{ - switch (request) - { - case CMD_REQUEST_COMMAND: - { - entity client; - - for (client = world; (client = find(client, classname, argv(1))); ) - LOG_INFO(etos(client), "\n"); - - return; - } - - default: - { - LOG_INFO("Incorrect parameters for ^2find^7\n"); - } - case CMD_REQUEST_USAGE: - { - LOG_INFO("\nUsage:^3 cl_cmd find classname\n"); - LOG_INFO(" Where 'classname' is the classname to search for.\n"); - return; - } - } -} - void LocalCommand_sendcvar(int request, int argc) { + TC(int, request); TC(int, argc); switch (request) { case CMD_REQUEST_COMMAND: @@ -493,57 +471,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 weaponpriority)") { LocalCommand_sendcvar(request, arguments); } void LocalCommand_macro_help() { - #define CLIENT_COMMAND(name, function, description) \ - { if (strtolower(description) != "") { LOG_INFO(" ^2", name, "^7: ", description, "\n"); } } - - CLIENT_COMMANDS(0, 0); - #undef CLIENT_COMMAND + FOREACH(CLIENT_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s\n", 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 + FOREACH(CLIENT_COMMANDS, true, CMD_Write_Alias("qc_cmd_cl", it.m_name, it.m_description)); } @@ -587,7 +552,7 @@ void GameCommand(string command) } // 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 + || 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;