X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=856783df0dedd28ebf0599cadb057a2fcb7ec28d;hp=4417515cf4e27e0132380ca8a571a39e98cc3566;hb=723fe3aa08556fdde679753c0afde734853f34e5;hpb=97fead85c9249051693f1980a26205c44eb418b3

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 4417515cf..856783df0 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -12,7 +12,9 @@
 #include "teamplay.qh"
 #include "playerdemo.qh"
 #include "spawnpoints.qh"
+#include "resources.qh"
 #include "g_damage.qh"
+#include "handicap.qh"
 #include "g_hook.qh"
 #include "command/common.qh"
 #include "cheats.qh"
@@ -59,6 +61,8 @@
 
 #include "../lib/warpzone/server.qh"
 
+#include <common/mutators/mutator/overkill/okvortex.qh>
+
 STATIC_METHOD(Client, Add, void(Client this, int _team))
 {
     ClientConnect(this);
@@ -218,9 +222,20 @@ void PutObserverInServer(entity this)
     bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this);
 	PlayerState_detach(this);
 
-	if (IS_PLAYER(this) && this.health >= 1) {
-        // despawn effect
-		Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1);
+	if (IS_PLAYER(this))
+	{
+		if(this.health >= 1)
+		{
+			// despawn effect
+			Send_Effect(EFFECT_SPAWN_NEUTRAL, this.origin, '0 0 0', 1);
+		}
+
+		// was a player, recount votes and ready status
+		if(IS_REAL_CLIENT(this))
+		{
+			if (vote_called) { VoteCount(false); }
+			ReadyCount();
+		}
     }
 
     {
@@ -257,7 +272,7 @@ void PutObserverInServer(entity this)
 	if (this.alivetime)
 	{
 		if (!warmup_stage)
-			PS_GR_P_ADDVAL(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
+			PlayerStats_GameReport_Event_Player(this, PLAYERSTATS_ALIVETIME, time - this.alivetime);
 		this.alivetime = 0;
 	}
 
@@ -268,7 +283,9 @@ void PutObserverInServer(entity this)
 	if (mutator_returnvalue) {
 	    // mutator prevents resetting teams+score
 	} else {
+		int oldteam = this.team;
 		this.team = -1;  // move this as it is needed to log the player spectating in eventlog
+		MUTATOR_CALLHOOK(Player_ChangedTeam, this, oldteam, this.team);
         this.frags = FRAGS_SPECTATOR;
         PlayerScore_Clear(this);  // clear scores when needed
     }
@@ -522,7 +539,6 @@ void PutPlayerInServer(entity this)
 		this.flags |= FL_NOTARGET;
 	this.takedamage = DAMAGE_AIM;
 	this.effects = EF_TELEPORT_BIT | EF_RESTARTANIM_BIT;
-	this.dmg = 2; // WTF
 
 	if (warmup_stage) {
 		this.ammo_shells = warmup_start_ammo_shells;
@@ -544,6 +560,8 @@ void PutPlayerInServer(entity this)
 		this.health = start_health;
 		this.armorvalue = start_armorvalue;
 		this.weapons = start_weapons;
+		GiveRandomWeapons(this, random_start_weapons_count,
+			autocvar_g_random_start_weapons, random_start_ammo);
 	}
 	SetSpectatee_status(this, 0);
 
@@ -638,9 +656,11 @@ void PutPlayerInServer(entity this)
 
 	PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false;
 
+	// player was spectator
 	if (CS(this).killcount == FRAGS_SPECTATOR) {
 		PlayerScore_Clear(this);
 		CS(this).killcount = 0;
+		CS(this).startplaytime = time;
 	}
 
 	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
@@ -857,19 +877,19 @@ Called when a client types 'kill' in the console
 .float clientkill_nexttime;
 void ClientKill_Now_TeamChange(entity this)
 {
-	if(CS(this).killindicator_teamchange == -1)
+	if(this.killindicator_teamchange == -1)
 	{
 		JoinBestTeam( this, false, true );
 	}
-	else if(CS(this).killindicator_teamchange == -2)
+	else if(this.killindicator_teamchange == -2)
 	{
 		if(blockSpectators)
 			Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_SPECTATE_WARNING, autocvar_g_maxplayers_spectator_blocktime);
 		PutObserverInServer(this);
 	}
 	else
-		SV_ChangeTeam(this, CS(this).killindicator_teamchange - 1);
-	CS(this).killindicator_teamchange = 0;
+		SV_ChangeTeam(this, this.killindicator_teamchange - 1);
+	this.killindicator_teamchange = 0;
 }
 
 void ClientKill_Now(entity this)
@@ -877,7 +897,7 @@ void ClientKill_Now(entity this)
 	if(this.vehicle)
 	{
 	    vehicles_exit(this.vehicle, VHEF_RELEASE);
-	    if(!CS(this).killindicator_teamchange)
+	    if(!this.killindicator_teamchange)
 	    {
             this.vehicle_health = -1;
             Damage(this, this, this, 1 , DEATH_KILL.m_id, this.origin, '0 0 0');
@@ -889,11 +909,13 @@ void ClientKill_Now(entity this)
 
 	this.killindicator = NULL;
 
-	if(CS(this).killindicator_teamchange)
+	if(this.killindicator_teamchange)
 		ClientKill_Now_TeamChange(this);
 
-	if(!IS_SPEC(this) && !IS_OBSERVER(this))
+	if (!IS_SPEC(this) && !IS_OBSERVER(this) && MUTATOR_CALLHOOK(ClientKill_Now, this) == false)
+	{
 		Damage(this, this, this, 100000, DEATH_KILL.m_id, this.origin, '0 0 0');
+	}
 
 	// now I am sure the player IS dead
 }
@@ -952,7 +974,7 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
     	return;
     killtime = M_ARGV(1, float);
 
-	CS(this).killindicator_teamchange = targetteam;
+	this.killindicator_teamchange = targetteam;
 
     if(!this.killindicator)
 	{
@@ -1187,7 +1209,10 @@ void ClientConnect(entity this)
 	PlayerStats_GameReport_AddEvent(sprintf("kills-%d", this.playerid));
 
 	// always track bots, don't ask for cl_allow_uidtracking
-    if (IS_BOT_CLIENT(this)) PlayerStats_GameReport_AddPlayer(this);
+	if (IS_BOT_CLIENT(this))
+		PlayerStats_GameReport_AddPlayer(this);
+	else
+		CS(this).allowed_timeouts = autocvar_sv_timeout_number;
 
 	if (autocvar_sv_eventlog)
 		GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? this.netaddress : "bot"), ":", playername(this, false)));
@@ -1196,8 +1221,6 @@ void ClientConnect(entity this)
 
 	CS(this).just_joined = true;  // stop spamming the eventlog with additional lines when the client connects
 
-	CS(this).netname_previous = strzone(this.netname);
-
 	if(teamplay && IS_PLAYER(this))
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_CONNECT_TEAM), this.netname);
 	else
@@ -1236,7 +1259,6 @@ void ClientConnect(entity this)
 	}
 
 	CS(this).jointime = time;
-	CS(this).allowed_timeouts = autocvar_sv_timeout_number;
 
 	if (IS_REAL_CLIENT(this))
 	{
@@ -1265,6 +1287,8 @@ void ClientConnect(entity this)
 		it.init_for_player(it, this);
 	});
 
+	Handicap_Initialize(this);
+
 	MUTATOR_CALLHOOK(ClientConnect, this);
 
 	if (IS_REAL_CLIENT(this))
@@ -1626,8 +1650,8 @@ void player_regen(entity this)
 		float mina, maxa, limith, limita;
 		maxa = autocvar_g_balance_armor_rotstable;
 		mina = autocvar_g_balance_armor_regenstable;
-		limith = autocvar_g_balance_health_limit;
-		limita = autocvar_g_balance_armor_limit;
+		limith = GetResourceLimit(this, RESOURCE_HEALTH);
+		limita = GetResourceLimit(this, RESOURCE_ARMOR);
 
 		regen_health_rotstable = regen_health_rotstable * max_mod;
 		regen_health_stable = regen_health_stable * max_mod;
@@ -1654,11 +1678,11 @@ void player_regen(entity this)
 
 		maxf = autocvar_g_balance_fuel_rotstable;
 		minf = autocvar_g_balance_fuel_regenstable;
-		limitf = autocvar_g_balance_fuel_limit;
+		limitf = GetResourceLimit(this, RESOURCE_FUEL);
 
 		this.ammo_fuel = CalcRotRegen(this.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > this.pauseregen_finished) * ((this.items & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > this.pauserotfuel_finished), limitf);
 	}
-	// Ugly hack to make sure the haelth and armor don't go beyond hard limit.
+	// Ugly hack to make sure the health and armor don't go beyond hard limit.
 	// TODO: Remove this hack when all code uses GivePlayerHealth and
 	// GivePlayerArmor.
 	if (this.health > RESOURCE_AMOUNT_HARD_LIMIT)
@@ -1736,6 +1760,8 @@ void SpectateCopy(entity this, entity spectatee)
 	this.weapons = spectatee.weapons;
 	this.vortex_charge = spectatee.vortex_charge;
 	this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo;
+	this.okvortex_charge = spectatee.okvortex_charge;
+	this.okvortex_chargepool_ammo = spectatee.okvortex_chargepool_ammo;
 	this.hagar_load = spectatee.hagar_load;
 	this.arc_heat_percent = spectatee.arc_heat_percent;
 	this.minelayer_mines = spectatee.minelayer_mines;
@@ -2472,19 +2498,22 @@ void PlayerPreThink (entity this)
 		// WORKAROUND: only use dropclient in server frames (frametime set).
 		// Never use it in cl_movement frames (frametime zero).
 		checkSpectatorBlock(this);
-    }
+	}
 
 	zoomstate_set = false;
 
 	// Check for nameless players
-	if (isInvisibleString(this.netname)) {
-		this.netname = strzone(sprintf("Player#%d", this.playerid));
-		// stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe?
-	}
-	if (this.netname != CS(this).netname_previous) {
-		if (autocvar_sv_eventlog) {
+	if (this.netname == "" || this.netname != CS(this).netname_previous)
+	{
+		bool assume_unchanged = (CS(this).netname_previous == "");
+		if (isInvisibleString(this.netname))
+		{
+			this.netname = strzone(sprintf("Player#%d", this.playerid));
+			assume_unchanged = false;
+			// stuffcmd(this, strcat("name ", this.netname, "\n")); // maybe?
+		}
+		if (!assume_unchanged && autocvar_sv_eventlog)
 			GameLogEcho(strcat(":name:", ftos(this.playerid), ":", playername(this, false)));
-        }
 		if (CS(this).netname_previous) strunzone(CS(this).netname_previous);
 		CS(this).netname_previous = strzone(this.netname);
 	}
@@ -2643,7 +2672,6 @@ void DrownPlayer(entity this)
 		if(this.air_finished < time)
 			PlayerSound(this, playersound_gasp, CH_PLAYER, VOL_BASE, VOICETYPE_PLAYERSOUND);
 		this.air_finished = time + autocvar_g_balance_contents_drowndelay;
-		this.dmg = 2;
 	}
 	else if (this.air_finished < time)
 	{	// drown!