From: terencehill <piuntn@gmail.com>
Date: Wed, 13 Apr 2022 11:42:42 +0000 (+0200)
Subject: Remove cvar default value from a tooltip. Add some  comments to make clear what Playe... 
X-Git-Tag: xonotic-v0.8.5~76
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11f1e4fdcb9f73a7675e3d0f8511b5887ff1a8e8;p=xonotic%2Fxonotic-data.pk3dir.git

Remove cvar default value from a tooltip. Add some  comments to make clear what PlayerScore_Clear and SetPlayerTeam do
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qc b/qcsrc/menu/xonotic/dialog_settings_effects.qc
index 89b3425e2..1a08a42bd 100644
--- 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 7b0c7ba29..44226c6f5 100644
--- 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 61f250f12..80892e652 100644
--- 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))