Remove cvar default value from a tooltip. Add some comments to make clear what Playe...

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 89b3425e2c772ad2e4caf3828f30d674d5852860..1a08a42bd32721bceaf53f21e026663226bdd36f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qc
@@ -211,7 +211,7 @@ void XonoticEffectsSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Corona brightness:")));
                me.TD(me, 1, 2, e = makeXonoticSlider_T(0, 1.5, 0.1, "r_coronas",
-                       _("Flare effects around certain lights, default 1")));
+                       _("Flare effects around certain lights")));
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2.8, e = makeXonoticCheckBox_T(0, "r_coronas_occlusionquery", _("Fade coronas according to visibility"),

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 7b0c7ba29e8d226ca42a1847490bb92bdbda0ab8..44226c6f576e1a1169a88d9ce7c837e08f925a5d 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -400,7 +400,7 @@ void PutObserverInServer(entity this, bool is_forced, bool use_spawnpoint)
        }
        else
        {
-               SetPlayerTeam(this, -1, TEAM_CHANGE_SPECTATOR);
+               SetPlayerTeam(this, -1, TEAM_CHANGE_SPECTATOR); // clears scores too in game modes without teams
                this.frags = FRAGS_SPECTATOR;
        }
 
@@ -760,7 +760,6 @@ void PutPlayerInServer(entity this)
        Unfreeze(this, false);
 
        MUTATOR_CALLHOOK(PlayerSpawn, this, spot);
-
        {
                string s = spot.target;
                if(g_assault || g_race) // TODO: make targeting work in assault & race without this hack

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 61f250f12a757bc492e885971796987674407e3f..80892e652891804e7fa6f83ff2f4cd623dcdd840 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -246,7 +246,7 @@ bool SetPlayerTeam(entity player, int team_index, int type)
        if (team_index != old_team_index)
        {
                KillPlayerForTeamChange(player);
-               PlayerScore_Clear(player);
+               PlayerScore_Clear(player); // works only in game modes without teams
                CS(player).parm_idlesince = time;
 
                if (!IS_BOT_CLIENT(player))