X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommands%2Fcl_cmd.qc;h=7735815d57f048e1c22920d2942ac984d19c2d8a;hb=bbd6fbcb695b11ee8b58f8536d53e600d8cbfcd7;hp=56709642026df191ce3c5c3eea00cb300d838ce5;hpb=f24c1ab39321a756bb76d1699a775fe1e42040ab;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 567096420..7735815d5 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -63,8 +63,8 @@ void LocalCommand_blurtest(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd blurtest"); - LOG_INFO(" No arguments required."); + LOG_HELP("Usage:^3 cl_cmd blurtest"); + LOG_HELP(" No arguments required."); return; } } @@ -108,25 +108,23 @@ void LocalCommand_boxparticles(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2boxparticles^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO( - "Usage:^3 lv_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\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; } @@ -166,8 +164,8 @@ void LocalCommand_create_scrshot_ent(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd create_scrshot_ent [path]"); - LOG_INFO(" Where 'path' can be the subdirectory of data/data in which the file is saved."); + 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; } } @@ -196,8 +194,8 @@ void LocalCommand_debugmodel(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd debugmodel model"); - LOG_INFO(" Where 'model' is a string of the model name to use for the debug model."); + 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; } } @@ -241,13 +239,11 @@ void LocalCommand_handlevote(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2handlevote^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd handlevote vote"); - LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name."); + LOG_HELP("Usage:^3 cl_cmd handlevote vote"); + LOG_HELP(" Where 'vote' is the selection for either the current poll or uid2name."); return; } } @@ -275,10 +271,10 @@ void LocalCommand_hud(int request, int argc) { if (argv(2) == "help") { - LOG_INFO(" quickmenu [[default | file | \"\"] submenu file]"); - 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."); - LOG_INFO("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option."); - LOG_INFO("A file name can also be given to open a different quickmenu"); + 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)); @@ -333,17 +329,15 @@ void LocalCommand_hud(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2hud^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd hud action [configname | radartoggle | layout]"); - LOG_INFO(" Where 'action' is the command to complete,"); - LOG_INFO(" 'configname' is the name to save to for \"save\" action,"); - LOG_INFO(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,"); - LOG_INFO(" and 'layout' is how to organize the scoreboard columns for the set action."); - LOG_INFO(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\""); + 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; } } @@ -358,19 +352,17 @@ void LocalCommand_localprint(int request, int argc) { if (argv(1)) { - centerprint_hud(argv(1)); + centerprint_AddStandard(argv(1)); return; } } default: - { - LOG_INFO("Incorrect parameters for ^2localprint^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd localprint \"message\""); - LOG_INFO(" 'message' is the centerprint message to send to yourself."); + LOG_HELP("Usage:^3 cl_cmd localprint \"message\""); + LOG_HELP(" 'message' is the centerprint message to send to yourself."); return; } } @@ -391,13 +383,11 @@ void LocalCommand_mv_download(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2mv_download^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd mv_download mapid"); - LOG_INFO(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu."); + 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; } } @@ -428,13 +418,11 @@ void LocalCommand_sendcvar(int request, int argc) } default: - { - LOG_INFO("Incorrect parameters for ^2sendcvar^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd sendcvar "); - LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server."); + LOG_HELP("Usage:^3 cl_cmd sendcvar "); + LOG_HELP(" Where 'cvar' is the cvar to send to the server."); return; } } @@ -455,8 +443,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; } } @@ -477,11 +465,11 @@ CLIENT_COMMAND(handlevote, "System to handle selecting a vote or option") { Loca 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); } +CLIENT_COMMAND(sendcvar, "Send a cvar to the server (like cl_weaponpriority)") { LocalCommand_sendcvar(request, arguments); } void LocalCommand_macro_help() { - FOREACH(CLIENT_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s", 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) @@ -528,14 +516,14 @@ void GameCommand(string command) { if (argc == 1) { - LOG_INFO("Client console commands:"); + LOG_HELP("Client console commands:"); LocalCommand_macro_help(); - LOG_INFO("\nGeneric commands shared by all programs:"); + 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."); - LOG_INFO("For help about a specific command, type cl_cmd help COMMAND"); + 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; }