X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fplayer.qc;h=26fc9e659204d7bf6305a5d2483bf1b2b4ba9819;hp=931ef826d9931f8889855b54dc89265520a1a8c7;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=25255db624631282c5e1765efbc9635083bdc532

diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc
index 931ef826d9..26fc9e6592 100644
--- a/qcsrc/server/player.qc
+++ b/qcsrc/server/player.qc
@@ -4,6 +4,7 @@
 #include "bot/api.qh"
 #include "cheats.qh"
 #include "g_damage.qh"
+#include "handicap.qh"
 #include "g_subs.qh"
 #include "miscfunctions.qh"
 #include "portals.qh"
@@ -317,9 +318,11 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
 	if(!DEATH_ISSPECIAL(deathtype))
 	{
-		damage *= bound(1.0, CS(this).cvar_cl_handicap, 10.0);
-		if(this != attacker && IS_PLAYER(attacker))
-			damage /= bound(1.0, CS(attacker).cvar_cl_handicap, 10.0);
+		damage *= Handicap_GetTotalHandicap(this);
+		if (this != attacker && IS_PLAYER(attacker))
+		{
+			damage /= Handicap_GetTotalHandicap(attacker);
+		}
 	}
 
 	if (time < this.spawnshieldtime && autocvar_g_spawnshield_blockdamage < 1)
@@ -472,10 +475,10 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	if (this != attacker) {
 		float realdmg = damage - excess;
 		if (IS_PLAYER(attacker)) {
-			PlayerScore_Add(attacker, SP_DMG, realdmg);
+			GameRules_scoring_add(attacker, DMG, realdmg);
 		}
 		if (IS_PLAYER(this)) {
-			PlayerScore_Add(this, SP_DMGTAKEN, realdmg);
+			GameRules_scoring_add(this, DMGTAKEN, realdmg);
 		}
 	}
 
@@ -514,7 +517,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
 		if(this.alivetime)
 		{
-			PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
+			PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
 			this.alivetime = 0;
 		}
 
@@ -535,7 +538,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		{
 			delete(this.killindicator);
 			this.killindicator = NULL;
-			if(CS(this).killindicator_teamchange)
+			if(this.killindicator_teamchange)
 				defer_ClientKill_Now_TeamChange = true;
 
 			if(this.classname == "body")
@@ -555,6 +558,7 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		if(w != WEP_Null && accuracy_isgooddamage(attacker, this))
 			CS(attacker).accuracy.(accuracy_frags[w.m_id-1]) += 1;
 
+		this.respawn_time = 0;
 		MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, this, deathtype, damage);
 		damage = M_ARGV(4, float);
 		excess = max(0, damage - take - save);
@@ -583,6 +587,9 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 		if(this.health >= 1 || !(IS_PLAYER(this) || this.classname == "body"))
 			return;
 
+		if (!this.respawn_time) // can be set in the mutator hook PlayerDies
+			calculate_player_respawn_time(this);
+
 		// when we get here, player actually dies
 
 		Unfreeze(this); // remove any icy remains
@@ -618,9 +625,6 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 
 		STAT(MOVEVARS_SPECIALCOMMAND, this) = false; // sweet release
 
-		// when to allow respawn
-		calculate_player_respawn_time(this);
-
 		this.death_time = time;
 		if (random() < 0.5)
 			animdecide_setstate(this, this.anim_state | ANIMSTATE_DEAD1, true);
@@ -668,15 +672,19 @@ void PlayerDamage(entity this, entity inflictor, entity attacker, float damage,
 	}
 }
 
-void MoveToTeam(entity client, int team_colour, int type)
+bool MoveToTeam(entity client, int team_colour, int type)
 {
 	int lockteams_backup = lockteams;  // backup any team lock
 	lockteams = 0;  // disable locked teams
 	TeamchangeFrags(client);  // move the players frags
-	SetPlayerColors(client, team_colour - 1);  // set the players colour
+	if (!SetPlayerTeamSimple(client, team_colour))
+	{
+		return false;
+	}
 	Damage(client, client, client, 100000, DEATH_AUTOTEAMCHANGE.m_id, client.origin, '0 0 0');  // kill the player
 	lockteams = lockteams_backup;  // restore the team lock
 	LogTeamchange(client.playerid, client.team, type);
+	return true;
 }
 
 /** print(), but only print if the server is not local */
@@ -939,7 +947,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc
 	}
 
 	if(flood)
-		LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding.\n");
+		LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding.");
 
 	// build sourcemsgstr by cutting off a prefix and replacing it by the other one
 	if(privatesay)