]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'terencehill/help_messages_cleanup' into 'master'
authorMario <mario.mario@y7mail.com>
Sat, 27 Feb 2021 11:05:55 +0000 (11:05 +0000)
committerMario <mario.mario@y7mail.com>
Sat, 27 Feb 2021 11:05:55 +0000 (11:05 +0000)
Help messages cleanup

See merge request xonotic/xonotic-data.pk3dir!875

1  2 
qcsrc/server/cheats.qc
qcsrc/server/command/cmd.qc
qcsrc/server/world.qc

diff --combined qcsrc/server/cheats.qc
index 00b39fbe2119ecdb8db1430380ce036c22025e05,a66726428b9eca1ffc524e2d10c443e5a66f9398..20a13f83e6cef5121b0c220a416fd8b756aab470
@@@ -300,11 -300,6 +300,6 @@@ float CheatCommand(entity this, int arg
                        IS_CHEAT(this, 0, argc, 0);
                        if(argc == 5)
                        {
-                               // arguments:
-                               //   effectname
-                               //   origin (0..1, on crosshair line)
-                               //   velocity
-                               //   howmany
                                f = stof(argv(2));
                                crosshair_trace(this);
                                start = (1-f) * this.origin + f * trace_endpos;
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd pointparticles effectname position(0..1) velocityvector multiplier\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd pointparticles <effectname> <position> <velocity> <countmultiplier>\n");
+                       sprint(this, "  Where <position> is a number from 0 to 1 representing distance on the crosshair line,\n");
+                       sprint(this, "  and <velocity> is a vector \"x y z\"\n");
                        break;
                case "trailparticles":
                        IS_CHEAT(this, 0, argc, 0);
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd trailparticles effectname\n");
+                       sprint(this, "Usage: sv_cheats 1; restart; cmd trailparticles <effectname>\n");
                        break;
                case "make":
                        IS_CHEAT(this, 0, argc, 0);
                        if(argc == 3)
                        {
-                               // arguments:
-                               //   modelname mode
                                f = stof(argv(2));
                                W_SetupShot(this, weaponentities[0], false, false, SND_Null, CH_WEAPON_A, 0, 0);
                                traceline(w_shotorg, w_shotorg + w_shotdir * 2048, MOVE_NORMAL, this);
                                }
                                else
                                {
 -                                      entity e = spawn();
 +                                      entity e = new(func_breakable);
                                        e.model = strzone(argv(1));
                                        e.mdl = "rocket_explode";
                                        SetResourceExplicit(e, RES_HEALTH, 1000);
                                                e.angles = fixedvectoangles2(trace_plane_normal, v_forward);
                                                e.angles = AnglesTransform_ApplyToAngles(e.angles, '-90 0 0'); // so unrotated models work
                                        }
 -                                      spawnfunc_func_breakable(e);
 +                                      func_breakable_setup(e);
                                        // now, is it valid?
                                        if(f == 0)
                                        {
                                }
                        }
                        else
-                               sprint(this, "Usage: sv_cheats 1; restart; cmd make models/... 0/1/2\n");
+                       {
+                               sprint(this, "Usage:^3 sv_cheats 1; restart; cmd make <modelname> <mode>\n");
+                               sprint(this, "  where <mode> can be 0, 1 or 2\n");
+                       }
                        break;
                case "penalty":
                        IS_CHEAT(this, 0, argc, 0);
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd penalty 5.0 AHAHAHAHAHAHAH))\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd penalty <duration> <reason>))\n");
                        break;
                case "dragbox_spawn": {
                        IS_CHEAT(this, 0, argc, 0);
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_setcnt cnt\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_setcnt <cnt>\n");
                        break;
                case "drag_save":
                        IS_CHEAT(this, 0, argc, 0);
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_save filename\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_save <filename>\n");
                        break;
                case "drag_saveraceent":
                        IS_CHEAT(this, 0, argc, 0);
                                DID_CHEAT();
                                break;
                        }
-                       sprint(this, "Usage: sv_cheats 1; restart; cmd dragbox_save filename\n");
+                       sprint(this, "Usage:^3 sv_cheats 1; restart; cmd dragbox_save <filename>\n");
                        break;
                case "drag_clear":
                        IS_CHEAT(this, 0, argc, 0);
index 66161af241a0bbf39c5375a9ea7a5eb4f94aef47,1b2959f40d39b018d690f1afc65a888bef7bc9ed..570b8e5fc0bfcf180cb2fb61526e3b025a624182
@@@ -83,8 -83,8 +83,8 @@@ void ClientCommand_autoswitch(entity ca
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd autoswitch selection\n");
-                       sprint(caller, "  Where 'selection' controls if autoswitch is on or off.\n");
+                       sprint(caller, "\nUsage:^3 cmd autoswitch <selection>\n");
+                       sprint(caller, "  Where <selection> controls if autoswitch is on or off.\n");
                        return;
                }
        }
@@@ -126,8 -126,8 +126,8 @@@ void ClientCommand_clientversion(entit
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd clientversion version\n");
-                       sprint(caller, "  Where 'version' is the game version reported by caller.\n");
+                       sprint(caller, "\nUsage:^3 cmd clientversion <version>\n");
+                       sprint(caller, "  Where <version> is the game version reported by caller.\n");
                        return;
                }
        }
@@@ -151,8 -151,8 +151,8 @@@ void ClientCommand_mv_getpicture(entit
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd mv_getpicture mapid\n");
-                       sprint(caller, "  Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n");
+                       sprint(caller, "\nUsage:^3 cmd mv_getpicture <mapid>\n");
+                       sprint(caller, "  Where <mapid> is the id number of the map to request an image of on the map vote selection menu.\n");
                        return;
                }
        }
@@@ -241,29 -241,29 +241,29 @@@ void ClientCommand_wpeditor(entity call
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd wpeditor action\n");
-                       sprint(caller, "  Where 'action' can be:\n");
-                       sprint(caller, "   ^5spawn^7: spawns a waypoint at player's position\n");
-                       sprint(caller, "   ^5remove^7: removes player's nearest waypoint\n");
-                       sprint(caller, "   ^5unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
-                       sprint(caller, "   ^5saveall^7: saves all waypoints and links to file\n");
-                       sprint(caller, "   ^5relinkall^7: relinks all waypoints as if they were respawned\n");
-                       sprint(caller, "   ^5spawn crosshair^7: spawns a waypoint at crosshair's position\n");
+                       sprint(caller, "\nUsage:^3 cmd wpeditor <action>\n");
+                       sprint(caller, "  Where <action> can be:\n");
+                       sprint(caller, "   ^2spawn^7: spawns a waypoint at player's position\n");
+                       sprint(caller, "   ^2remove^7: removes player's nearest waypoint\n");
+                       sprint(caller, "   ^2unreachable^7: reveals waypoints and items unreachable from the current position and spawnpoints without a nearest waypoint\n");
+                       sprint(caller, "   ^2saveall^7: saves all waypoints and links to file\n");
+                       sprint(caller, "   ^2relinkall^7: relinks all waypoints as if they were respawned\n");
+                       sprint(caller, "   ^2spawn crosshair^7: spawns a waypoint at crosshair's position\n");
                        sprint(caller, "   ^7 in general useful to create special and hardwired links with ease from existing waypoints\n");
                        sprint(caller, "   ^7 in particular it's the only way to create custom jumppad waypoints (spawn another waypoint to create destination))\n");
-                       sprint(caller, "   ^5spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
-                       sprint(caller, "   ^5spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
-                       sprint(caller, "   ^5spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
+                       sprint(caller, "   ^2spawn jump^7: spawns a jump waypoint (place it at least 60 qu before jump start, spawn another waypoint to create destination)\n");
+                       sprint(caller, "   ^2spawn crouch^7: spawns a crouch waypoint (it links only to very close waypoints)\n");
+                       sprint(caller, "   ^2spawn support^7: spawns a support waypoint (spawn another waypoint to create destination from which all incoming links are removed)\n");
                        sprint(caller, "   ^7 useful to replace links to problematic jumppad/teleport waypoints\n");
-                       sprint(caller, "   ^5hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
-                       sprint(caller, "   ^5hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
-                       sprint(caller, "   ^5lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
-                       sprint(caller, "   ^5symorigin get|set\n");
-                       sprint(caller, "   ^5symorigin get|set p1 p2 ... pX\n");
-                       sprint(caller, "   ^5symaxis get|set p1 p2\n");
-                       sprint(caller, "   ^7 where p1 p2 ... pX are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
+                       sprint(caller, "   ^2hardwire^7: marks the nearest waypoint as origin of a new hardwired link (spawn another waypoint over an existing one to create destination)\n");
+                       sprint(caller, "   ^2hardwire crosshair^7: marks the waypoint at crosshair instead of the nearest waypoint\n");
+                       sprint(caller, "   ^2lock^7: locks link display of the aimed waypoint (unlocks if no waypoint is found at crosshair's position)\n");
+                       sprint(caller, "   ^2symorigin get|set\n");
+                       sprint(caller, "   ^2symorigin get|set <p1> <p2> ... <pX>\n");
+                       sprint(caller, "   ^2symaxis get|set <p1> <p2>\n");
+                       sprint(caller, "   ^7 where <p1> <p2> ... <pX> are positions (\"x y z\", z can be omitted) that you know are perfectly symmetrical"
                                                                " so you can determine origin/axis of symmetry of maps without ctf flags or where flags aren't perfectly symmetrical\n");
-                       sprint(caller, "  See 'wpeditor_menu' for a selectable list of various commands and useful settings to edit waypoints.\n");
+                       sprint(caller, "  See ^5wpeditor_menu^7 for a selectable list of various commands and useful settings to edit waypoints.\n");
                        return;
                }
        }
@@@ -429,7 -429,7 +429,7 @@@ void ClientCommand_say(entity caller, i
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd say <message>\n");
-                       sprint(caller, "  Where 'message' is the string of text to say.\n");
+                       sprint(caller, "  Where <message> is the string of text to say.\n");
                        return;
                }
        }
@@@ -450,7 -450,7 +450,7 @@@ void ClientCommand_say_team(entity call
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd say_team <message>\n");
-                       sprint(caller, "  Where 'message' is the string of text to say.\n");
+                       sprint(caller, "  Where <message> is the string of text to say.\n");
                        return;
                }
        }
@@@ -528,9 -528,9 +528,9 @@@ void ClientCommand_selectteam(entity ca
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd selectteam team\n");
-                       sprint(caller, "  Where 'team' is the prefered team to try and join.\n");
-                       sprint(caller, "  Full list of options here: \"red, blue, yellow, pink, auto\"\n");
+                       sprint(caller, "\nUsage:^3 cmd selectteam <team>\n");
+                       sprint(caller, "  Where <team> is the prefered team to try and join.\n");
+                       sprint(caller, "  Full list of options here: red, blue, yellow, pink, auto.\n");
                        return;
                }
        }
@@@ -554,7 -554,7 +554,7 @@@ void ClientCommand_selfstuff(entity cal
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd selfstuff <command>\n");
-                       sprint(caller, "  Where 'command' is the string to be stuffed to your client.\n");
+                       sprint(caller, "  Where <command> is the string to be stuffed to your client.\n");
                        return;
                }
        }
@@@ -588,7 -588,7 +588,7 @@@ void ClientCommand_sentcvar(entity call
                case CMD_REQUEST_USAGE:
                {
                        sprint(caller, "\nUsage:^3 cmd sentcvar <cvar>\n");
-                       sprint(caller, "  Where 'cvar' is the cvar plus arguments to send to the server.\n");
+                       sprint(caller, "  Where <cvar> is the cvar plus arguments to send to the server.\n");
                        return;
                }
        }
@@@ -619,7 -619,7 +619,7 @@@ void ClientCommand_spectate(entity call
                                                        sprint(caller, "Can't spectate ", argv(1), "^7\n");
                                        }
                                        else
-                                               sprint(caller, "cmd spectate client only works when you are spectator/observer\n");
+                                               sprint(caller, "cmd spectate <client> only works when you are spectator/observer\n");
                                        return;
                                }
  
                default:
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd spectate [client]\n");
-                       sprint(caller, "  Where 'client' can be the player to spectate.\n");
+                       sprint(caller, "\nUsage:^3 cmd spectate [<client>]\n");
+                       sprint(caller, "  Where <client> can be the player to spectate.\n");
                        return;
                }
        }
@@@ -661,8 -661,8 +661,8 @@@ void ClientCommand_suggestmap(entity ca
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd suggestmap map\n");
-                       sprint(caller, "  Where 'map' is the name of the map to suggest.\n");
+                       sprint(caller, "\nUsage:^3 cmd suggestmap <map>\n");
+                       sprint(caller, "  Where <map> is the name of the map to suggest.\n");
                        return;
                }
        }
@@@ -718,8 -718,8 +718,8 @@@ void ClientCommand_tell(entity caller, 
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd tell client <message>\n");
-                       sprint(caller, "  Where 'client' is the entity number or name of the player to send 'message' to.\n");
+                       sprint(caller, "\nUsage:^3 cmd tell <client> <message>\n");
+                       sprint(caller, "  Where <client> is the entity number or name of the player to send <message> to.\n");
                        return;
                }
        }
@@@ -764,9 -764,10 +764,10 @@@ void ClientCommand_voice(entity caller
                        sprint(caller, sprintf("Incorrect parameters for ^2%s^7\n", argv(0)));
                case CMD_REQUEST_USAGE:
                {
-                       sprint(caller, "\nUsage:^3 cmd voice messagetype <soundname>\n");
-                       sprint(caller, "  'messagetype' is the type of broadcast to do, like team only or such,\n");
-                       sprint(caller, "  and 'soundname' is the string/filename of the sound/voice message to play.\n");
+                       sprint(caller, "\nUsage:^3 cmd voice <voicetype> [<message>]\n");
+                       sprint(caller, "  <voicetype> is the type of voice message, it can be one of these:\n");
+                       sprint(caller, sprintf("   %s\n", allvoicesamples));
+                       sprint(caller, "  and <message> is the text message to send.\n");
                        return;
                }
        }
@@@ -899,15 -900,7 +900,15 @@@ void SV_ParseClientCommand(entity this
                case "prespawn": break;                            // handled by engine in host_cmd.c
                case "sentcvar": break;                            // handled by server in this file
                case "spawn": break;                               // handled by engine in host_cmd.c
 -              case "color": case "topcolor": case "bottomcolor": if(teamplay) return; else break; // handled by engine in host_cmd.c
 +              case "color": case "topcolor": case "bottomcolor": // handled by engine in host_cmd.c
 +                      if(!IS_CLIENT(this)) // on connection
 +                      {
 +                              // since gamecode doesn't have any calls earlier than this, do the connecting message here
 +                              Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_CONNECTING, this.netname);
 +                      }
 +                      if(teamplay)
 +                              return;
 +                      break;
                case "c2s": Net_ClientCommand(this, command); return; // handled by net.qh
  
                default:
                        sprint(this, "\nCommon networked commands:\n");
                        CommonCommand_macro_help(this);
  
-                       sprint(this, "\nUsage:^3 cmd COMMAND...^7, where possible commands are listed above.\n");
-                       sprint(this, "For help about a specific command, type cmd help COMMAND\n");
+                       sprint(this, "\nUsage:^3 cmd <command>^7, where possible commands are listed above.\n");
+                       sprint(this, "For help about a specific command, type cmd help <command>\n");
                        return;
                }
                else if (CommonCommand_macro_usage(argc, this))  // Instead of trying to call a command, we're going to see detailed information about it
diff --combined qcsrc/server/world.qc
index e41eb37ce8d9406555d3aee671d25064dd40b255,9734bcef54507a3f4193f57c892e8193e5f3124c..2cacbac1aad073eab420b2ce9ed10fbeecf4be87
@@@ -171,7 -171,6 +171,7 @@@ void cvar_changes_init(
  #define BADPREFIX(p) if(substring(k, 0, strlen(p)) == p) continue
  #define BADPRESUFFIX(p,s) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s) continue
  #define BADCVAR(p) if(k == p) continue
 +#define BADVALUE(p, val) if (k == p && v == val) continue
  
                // general excludes and namespaces for server admin used cvars
                BADPREFIX("help_"); // PN's server has this listed as changed, let's not rat him out for THAT
                BADCVAR("sv_vote_master_commands");
                BADCVAR("sv_vote_master_password");
                BADCVAR("sv_vote_simple_majority_factor");
 +              BADVALUE("sys_ticrate", "0.0166667");
 +              BADVALUE("sys_ticrate", "0.0333333");
                BADCVAR("teamplay_mode");
                BADCVAR("timelimit_override");
                BADPREFIX("g_warmup_");
                BADCVAR("g_lms_weaponarena");
                BADCVAR("g_ctf_stalemate_time");
  
 -              if(cvar_string("g_mod_balance") == "Testing")
 -              {
 -                      // (temporary) while using the Testing balance, any weapon balance cvars are allowed to be changed
 -                      BADPREFIX("g_balance_");
 -              }
 -
  #undef BADPRESUFFIX
  #undef BADPREFIX
  #undef BADCVAR
 +#undef BADVALUE
  
                if(pureadding)
                {
@@@ -942,12 -944,18 +942,18 @@@ spawnfunc(worldspawn
        maplist_reply = strzone(getmaplist());
        lsmaps_reply = strzone(getlsmaps());
        monsterlist_reply = strzone(getmonsterlist());
+       bool records_available = false;
        for(int i = 0; i < 10; ++i)
        {
                string s = getrecords(i);
-               if (s)
+               if (s != "")
+               {
                        records_reply[i] = strzone(s);
+                       records_available = true;
+               }
        }
+       if (!records_available)
+               records_reply[0] = "No records available for the current game mode.\n";
        ladder_reply = strzone(getladder());
        rankings_reply = strzone(getrankings());