X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcommands%2Fcl_cmd.qc;h=6de891e35bd9c8fb6c0ae442fb7f13e165b08dfd;hb=eb877d9a99429c3ffc846377fac46fb750af8620;hp=631090cc1f9b7d119a2a9847b9d6ee5619cdd568;hpb=34e7f534e2015466228eb3a78c9857741b736dca;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 631090cc1..6de891e35 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -59,7 +59,7 @@ void LocalCommand_blurtest(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd blurtest\n"); + LOG_INFO("Usage:^3 cl_cmd blurtest\n"); LOG_INFO(" No arguments required.\n"); return; } @@ -109,7 +109,7 @@ void LocalCommand_boxparticles(int request, int argc) } 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("Usage:^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"); @@ -134,8 +134,9 @@ void LocalCommand_create_scrshot_ent(int 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) { @@ -145,7 +146,7 @@ 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.\n"); fclose(fh); } @@ -159,8 +160,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_INFO("Usage:^3 cl_cmd create_scrshot_ent [path]\n"); + LOG_INFO(" Where 'path' can be the subdirectory of data/data in which the file is saved.\n"); return; } } @@ -189,7 +190,7 @@ void LocalCommand_debugmodel(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd debugmodel model\n"); + LOG_INFO("Usage:^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; } @@ -239,7 +240,7 @@ void LocalCommand_handlevote(int request, int argc) } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd handlevote vote\n"); + LOG_INFO("Usage:^3 cl_cmd handlevote vote\n"); LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name.\n"); return; } @@ -248,7 +249,7 @@ 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(entity this, entity actor, entity trigger); @@ -278,15 +279,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 + QuickMenu_Open(argv(2), argv(3), file); // mode, submenu return; } @@ -338,7 +341,7 @@ void LocalCommand_hud(int request, int argc) } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd hud action [configname | radartoggle | layout]\n"); + LOG_INFO("Usage:^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"); @@ -369,7 +372,7 @@ void LocalCommand_localprint(int request, int argc) } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd localprint \"message\"\n"); + LOG_INFO("Usage:^3 cl_cmd localprint \"message\"\n"); LOG_INFO(" 'message' is the centerprint message to send to yourself.\n"); return; } @@ -396,7 +399,7 @@ void LocalCommand_mv_download(int request, int argc) } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd mv_download mapid\n"); + LOG_INFO("Usage:^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; } @@ -433,7 +436,7 @@ void LocalCommand_sendcvar(int request, int argc) } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 cl_cmd sendcvar \n"); + LOG_INFO("Usage:^3 cl_cmd sendcvar \n"); LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server.\n"); return; } @@ -528,7 +531,7 @@ void GameCommand(string command) { if (argc == 1) { - LOG_INFO("\nClient console commands:\n"); + LOG_INFO("Client console commands:\n"); LocalCommand_macro_help(); LOG_INFO("\nGeneric commands shared by all programs:\n");