X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommand%2Fcl_cmd.qc;h=88cd246ff106fe5246ad3de4b721ced2e1fd80bf;hp=d8e39a80f34bcd699c5e9239720e2be70ba78492;hb=14a31565a2bc3c9a8871e6b3e768c68f7e58eda5;hpb=c67e77ba36fb8dd44b39722e41943b6671b549ff diff --git a/qcsrc/client/command/cl_cmd.qc b/qcsrc/client/command/cl_cmd.qc index d8e39a80f..88cd246ff 100644 --- a/qcsrc/client/command/cl_cmd.qc +++ b/qcsrc/client/command/cl_cmd.qc @@ -20,7 +20,7 @@ #include "../../common/command/generic.qh" -void DrawDebugModel() +void DrawDebugModel(entity this) { if(time - floor(time) > 0.5) { @@ -53,22 +53,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\n"); return; } default: case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd blurtest\n"); - print(" No arguments required.\n"); + LOG_INFO("\nUsage:^3 cl_cmd blurtest\n"); + LOG_INFO(" No arguments required.\n"); return; } } #else if(request) { - print("Blurtest is not enabled on this client.\n"); + LOG_INFO("Blurtest is not enabled on this client.\n"); return; } #endif @@ -82,7 +82,7 @@ void LocalCommand_boxparticles(int request, int argc) { if (argc == 9) { - int effect = particleeffectnum(argv(1)); + int effect = _particleeffectnum(argv(1)); if (effect >= 0) { int index = stoi(argv(2)); @@ -104,22 +104,22 @@ void LocalCommand_boxparticles(int request, int argc) } default: - print("Incorrect parameters for ^2boxparticles^7\n"); + LOG_INFO("Incorrect parameters for ^2boxparticles^7\n"); 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_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"); return; } } @@ -142,13 +142,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/", MapInfo_Map_bspname, "_scrshot_ent.txt^7.\n"); fclose(fh); } else { - print("^1Error: ^7Could not dump to file!\n"); + LOG_INFO("^1Error: ^7Could not dump to file!\n"); } return; } @@ -156,8 +156,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_INFO("\nUsage:^3 cl_cmd create_scrshot_ent\n"); + LOG_INFO(" No arguments required.\n"); return; } } @@ -174,7 +174,7 @@ void LocalCommand_debugmodel(int request, int argc) debugmodel_entity = spawn(); 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; @@ -186,8 +186,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_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"); return; } } @@ -230,11 +230,11 @@ void LocalCommand_handlevote(int request, int argc) } default: - print("Incorrect parameters for ^2handlevote^7\n"); + LOG_INFO("Incorrect parameters for ^2handlevote^7\n"); 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_INFO("\nUsage:^3 cl_cmd handlevote vote\n"); + LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name.\n"); return; } } @@ -254,6 +254,24 @@ void LocalCommand_hud(int request, int argc) return; } + case "quickmenu": + { + 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(); + return; + } + case "save": { if(argv(2)) @@ -287,7 +305,7 @@ void LocalCommand_hud(int request, int argc) HUD_Radar_Show_Maximized(!hud_panel_radar_maximized,0); return; } - + case "clickradar": { HUD_Radar_Show_Maximized(!hud_panel_radar_mouse,1); @@ -297,15 +315,18 @@ void LocalCommand_hud(int request, int argc) } default: - print("Incorrect parameters for ^2hud^7\n"); + LOG_INFO("Incorrect parameters for ^2hud^7\n"); 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, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); + 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(" 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(" Submenu option allows to open quickmenu directly in a submenu, it requires to specify 'default', 'file' or '\"\"' option.\n"); + LOG_INFO(" Full list of commands here: \"configure, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); return; } } @@ -325,11 +346,11 @@ void LocalCommand_localprint(int request, int argc) } default: - print("Incorrect parameters for ^2localprint^7\n"); + LOG_INFO("Incorrect parameters for ^2localprint^7\n"); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd localprint \"message\"\n"); - print(" 'message' is the centerprint message to send to yourself.\n"); + LOG_INFO("\nUsage:^3 cl_cmd localprint \"message\"\n"); + LOG_INFO(" 'message' is the centerprint message to send to yourself.\n"); return; } } @@ -349,11 +370,11 @@ void LocalCommand_mv_download(int request, int argc) } default: - print("Incorrect parameters for ^2mv_download^7\n"); + LOG_INFO("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"); + 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; } } @@ -368,17 +389,17 @@ void LocalCommand_find(int request, int argc) entity client; for(client = world; (client = find(client, classname, argv(1))); ) - print(etos(client), "\n"); + LOG_INFO(etos(client), "\n"); return; } default: - print("Incorrect parameters for ^2find^7\n"); + LOG_INFO("Incorrect parameters for ^2find^7\n"); case CMD_REQUEST_USAGE: { - print("\nUsage:^3 cl_cmd find classname\n"); - print(" Where 'classname' is the classname to search for.\n"); + LOG_INFO("\nUsage:^3 cl_cmd find classname\n"); + LOG_INFO(" Where 'classname' is the classname to search for.\n"); return; } } @@ -408,11 +429,11 @@ void LocalCommand_sendcvar(int request, int argc) } default: - print("Incorrect parameters for ^2sendcvar^7\n"); + LOG_INFO("Incorrect parameters for ^2sendcvar^7\n"); 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_INFO("\nUsage:^3 cl_cmd sendcvar \n"); + LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server.\n"); return; } } @@ -463,7 +484,7 @@ void LocalCommand_(int request) void LocalCommand_macro_help() { #define CLIENT_COMMAND(name,function,description) \ - { if(strtolower(description) != "") { print(" ^2", name, "^7: ", description, "\n"); } } + { if(strtolower(description) != "") { LOG_INFO(" ^2", name, "^7: ", description, "\n"); } } CLIENT_COMMANDS(0, 0); #undef CLIENT_COMMAND @@ -523,14 +544,14 @@ void GameCommand(string command) { if(argc == 1) { - print("\nClient console commands:\n"); + LOG_INFO("\nClient console commands:\n"); LocalCommand_macro_help(); - print("\nGeneric commands shared by all programs:\n"); + LOG_INFO("\nGeneric commands shared by all programs:\n"); 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_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"); return; } @@ -550,7 +571,7 @@ void GameCommand(string command) ) 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"); + LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n"); return; }