X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fclient.qc;h=3b48e5c1cfa38c7270cd43adc0b44171176c6809;hb=d5634fe916916ac8c4ab0984240ac1bf0547e1b3;hp=b3e87e03b985522079ee9295b650b31f8e9c3915;hpb=931d24d4337e58557fa82a68aa8a740e523c2f22;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index b3e87e03b..11833b8c9 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -37,6 +37,7 @@
 #include "weapons/weaponsystem.qh"
 
 #include "../common/net_notice.qh"
+#include "../common/net_linked.qh"
 #include "../common/physics/player.qh"
 
 #include "../common/items/_mod.qh"
@@ -112,7 +113,6 @@ bool ClientData_Send(entity this, entity to, int sf)
 	if (e.race_completed)       sf |= 1; // forced scoreboard
 	if (to.spectatee_status)    sf |= 2; // spectator ent number follows
 	if (e.zoomstate)            sf |= 4; // zoomed
-	if (e.porto_v_angle_held)   sf |= 8; // angles held
 	if (autocvar_sv_showspectators) sf |= 16; // show spectators
 
 	WriteHeader(MSG_ENTITY, ENT_CLIENT_CLIENTDATA);
@@ -122,11 +122,6 @@ bool ClientData_Send(entity this, entity to, int sf)
 	{
 		WriteByte(MSG_ENTITY, to.spectatee_status);
 	}
-	if (sf & 8)
-	{
-		WriteAngle(MSG_ENTITY, e.v_angle.x);
-		WriteAngle(MSG_ENTITY, e.v_angle.y);
-	}
 
 	if(sf & 16)
 	{
@@ -236,7 +231,7 @@ void PutObserverInServer(entity this)
         this.angles_z = 0;
         this.fixangle = true;
         // offset it so that the spectator spawns higher off the ground, looks better this way
-        setorigin(this, spot.origin + STAT(PL_VIEW_OFS, NULL));
+        setorigin(this, spot.origin + STAT(PL_VIEW_OFS, this));
         this.prevorigin = this.origin;
         if (IS_REAL_CLIENT(this))
         {
@@ -253,11 +248,11 @@ void PutObserverInServer(entity this)
 	        FixPlayermodel(this);
         }
         setmodel(this, MDL_Null);
-        setsize(this, STAT(PL_CROUCH_MIN, NULL), STAT(PL_CROUCH_MAX, NULL));
+        setsize(this, STAT(PL_CROUCH_MIN, this), STAT(PL_CROUCH_MAX, this));
         this.view_ofs = '0 0 0';
     }
 
-    RemoveGrapplingHook(this);
+    RemoveGrapplingHooks(this);
 	Portal_ClearAll(this);
 	Unfreeze(this);
 	SetSpectatee(this, NULL);
@@ -284,8 +279,8 @@ void PutObserverInServer(entity this)
 	if (this.killcount != FRAGS_SPECTATOR)
 	{
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_SPECTATE, this.netname);
-		if(!intermission_running)
-		if(autocvar_g_chat_nospectators == 1 || (!(warmup_stage || gameover) && autocvar_g_chat_nospectators == 2))
+		if(!game_stopped)
+		if(autocvar_g_chat_nospectators == 1 || (!warmup_stage && autocvar_g_chat_nospectators == 2))
 			Send_Notification(NOTIF_ONE_ONLY, this, MSG_INFO, INFO_CHAT_NOSPECTATORS);
 
 		if(this.just_joined == false) {
@@ -304,6 +299,8 @@ void PutObserverInServer(entity this)
 	TRANSMUTE(Observer, this);
 	this.iscreature = false;
 	this.teleportable = TELEPORT_SIMPLE;
+	if(this.damagedbycontents)
+		IL_REMOVE(g_damagedbycontents, this);
 	this.damagedbycontents = false;
 	this.health = FRAGS_SPECTATOR;
 	SetSpectatee_status(this, etof(this));
@@ -334,19 +331,19 @@ void PutObserverInServer(entity this)
 	this.istypefrag = 0;
 	setthink(this, func_null);
 	this.nextthink = 0;
-	this.hook_time = 0;
 	this.deadflag = DEAD_NO;
 	this.crouch = false;
+	this.revive_progress = 0;
 	this.revival_time = 0;
 
 	this.items = 0;
 	this.weapons = '0 0 0';
+	this.dual_weapons = '0 0 0';
 	this.drawonlytoclient = this;
 
 	this.weaponmodel = "";
 	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
-		this.weaponentities[slot].weaponname = "";
 		this.weaponentities[slot] = NULL;
 	}
 	this.exteriorweaponentity = NULL;
@@ -359,9 +356,14 @@ void PutObserverInServer(entity this)
 	this.fire_endtime = -1;
 	this.event_damage = func_null;
 
-	STAT(ACTIVEWEAPON, this) = WEP_Null.m_id;
-	STAT(SWITCHINGWEAPON, this) = WEP_Null.m_id;
-	STAT(SWITCHWEAPON, this) = WEP_Null.m_id;
+	for(int slot = 0; slot < MAX_AXH; ++slot)
+	{
+		entity axh = this.(AuxiliaryXhair[slot]);
+		this.(AuxiliaryXhair[slot]) = NULL;
+
+		if(axh.owner == this && axh != NULL && !wasfreed(axh))
+			delete(axh);
+	}
 }
 
 int player_getspecies(entity this)
@@ -382,11 +384,12 @@ void FixPlayermodel(entity player)
 	{
 		if(teamplay)
 		{
-			string s = Static_Team_ColorName_Lower(player.team);
-			if (s != "neutral")
+			switch(player.team)
 			{
-				defaultmodel = cvar_string(strcat("sv_defaultplayermodel_", s));
-				defaultskin = cvar(strcat("sv_defaultplayerskin_", s));
+				case NUM_TEAM_1: defaultmodel = autocvar_sv_defaultplayermodel_red; defaultskin = autocvar_sv_defaultplayerskin_red; break;
+				case NUM_TEAM_2: defaultmodel = autocvar_sv_defaultplayermodel_blue; defaultskin = autocvar_sv_defaultplayerskin_blue; break;
+				case NUM_TEAM_3: defaultmodel = autocvar_sv_defaultplayermodel_yellow; defaultskin = autocvar_sv_defaultplayerskin_yellow; break;
+				case NUM_TEAM_4: defaultmodel = autocvar_sv_defaultplayermodel_pink; defaultskin = autocvar_sv_defaultplayerskin_pink; break;
 			}
 		}
 
@@ -417,9 +420,13 @@ void FixPlayermodel(entity player)
 	{
 		if(teamplay)
 		{
-			string s = Static_Team_ColorName_Lower(player.team);
-			if (s != "neutral")
-				defaultskin = cvar(strcat("sv_defaultplayerskin_", s));
+			switch(player.team)
+			{
+				case NUM_TEAM_1: defaultskin = autocvar_sv_defaultplayerskin_red; break;
+				case NUM_TEAM_2: defaultskin = autocvar_sv_defaultplayerskin_blue; break;
+				case NUM_TEAM_3: defaultskin = autocvar_sv_defaultplayerskin_yellow; break;
+				case NUM_TEAM_4: defaultskin = autocvar_sv_defaultplayerskin_pink; break;
+			}
 		}
 
 		if(!defaultskin)
@@ -481,240 +488,262 @@ void FixPlayermodel(entity player)
 				setcolor(player, stof(autocvar_sv_defaultplayercolors));
 }
 
-
-/** Called when a client spawns in the server */
-void PutClientInServer(entity this)
+void PutPlayerInServer(entity this)
 {
-	if (IS_BOT_CLIENT(this)) {
-		TRANSMUTE(Player, this);
-	} else if (IS_REAL_CLIENT(this)) {
-		msg_entity = this;
-		WriteByte(MSG_ONE, SVC_SETVIEW);
-		WriteEntity(MSG_ONE, this);
-	}
-	if (gameover) {
-		TRANSMUTE(Observer, this);
-	}
+	if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
 
-	SetSpectatee(this, NULL);
+	PlayerState_attach(this);
+	accuracy_resend(this);
 
-	// reset player keys
-	this.itemkeys = 0;
+	if (this.team < 0)
+		JoinBestTeam(this, false, true);
 
-	MUTATOR_CALLHOOK(PutClientInServer, this);
+	entity spot = SelectSpawnPoint(this, false);
+	if (!spot) {
+		Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_NOSPAWNS);
+		return; // spawn failed
+	}
 
-	if (IS_OBSERVER(this)) {
-		PutObserverInServer(this);
-	} else if (IS_PLAYER(this)) {
-		if (this.vehicle) vehicles_exit(this.vehicle, VHEF_RELEASE);
+	TRANSMUTE(Player, this);
 
-		PlayerState_attach(this);
-		accuracy_resend(this);
+	this.wasplayer = true;
+	this.iscreature = true;
+	this.teleportable = TELEPORT_NORMAL;
+	if(!this.damagedbycontents)
+		IL_PUSH(g_damagedbycontents, this);
+	this.damagedbycontents = true;
+	set_movetype(this, MOVETYPE_WALK);
+	this.solid = SOLID_SLIDEBOX;
+	this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;
+	if (autocvar_g_playerclip_collisions)
+		this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
+	if (IS_BOT_CLIENT(this) && autocvar_g_botclip_collisions)
+		this.dphitcontentsmask |= DPCONTENTS_BOTCLIP;
+	this.frags = FRAGS_PLAYER;
+	if (INDEPENDENT_PLAYERS) MAKE_INDEPENDENT_PLAYER(this);
+	this.flags = FL_CLIENT | FL_PICKUPITEMS;
+	if (autocvar__notarget)
+		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;
+		this.ammo_nails = warmup_start_ammo_nails;
+		this.ammo_rockets = warmup_start_ammo_rockets;
+		this.ammo_cells = warmup_start_ammo_cells;
+		this.ammo_plasma = warmup_start_ammo_plasma;
+		this.ammo_fuel = warmup_start_ammo_fuel;
+		this.health = warmup_start_health;
+		this.armorvalue = warmup_start_armorvalue;
+		this.weapons = WARMUP_START_WEAPONS;
+	} else {
+		this.ammo_shells = start_ammo_shells;
+		this.ammo_nails = start_ammo_nails;
+		this.ammo_rockets = start_ammo_rockets;
+		this.ammo_cells = start_ammo_cells;
+		this.ammo_plasma = start_ammo_plasma;
+		this.ammo_fuel = start_ammo_fuel;
+		this.health = start_health;
+		this.armorvalue = start_armorvalue;
+		this.weapons = start_weapons;
+	}
+	SetSpectatee_status(this, 0);
+
+	this.dual_weapons = '0 0 0';
+
+	this.superweapons_finished = (this.weapons & WEPSET_SUPERWEAPONS) ? time + autocvar_g_balance_superweapons_time : 0;
+
+	this.items = start_items;
+
+	this.spawnshieldtime = time + autocvar_g_spawnshieldtime;
+	this.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot_spawn;
+	this.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot_spawn;
+	this.pauserotfuel_finished = time + autocvar_g_balance_pause_fuel_rot_spawn;
+	this.pauseregen_finished = time + autocvar_g_balance_pause_health_regen_spawn;
+	// extend the pause of rotting if client was reset at the beginning of the countdown
+	if (!autocvar_sv_ready_restart_after_countdown && time < game_starttime) { // TODO why is this cvar NOTted?
+		float f = game_starttime - time;
+		this.spawnshieldtime += f;
+		this.pauserotarmor_finished += f;
+		this.pauserothealth_finished += f;
+		this.pauseregen_finished += f;
+	}
+	this.damageforcescale = 2;
+	this.death_time = 0;
+	this.respawn_flags = 0;
+	this.respawn_time = 0;
+	this.stat_respawn_time = 0;
+	this.scale = autocvar_sv_player_scale;
+	this.fade_time = 0;
+	this.pain_frame = 0;
+	this.pain_finished = 0;
+	this.pushltime = 0;
+	setthink(this, func_null); // players have no think function
+	this.nextthink = 0;
+	this.dmg_team = 0;
+	this.ballistics_density = autocvar_g_ballistics_density_player;
 
-		if (this.team < 0)
-			JoinBestTeam(this, false, true);
+	this.deadflag = DEAD_NO;
 
-		entity spot = SelectSpawnPoint(this, false);
-		if (!spot) {
-			Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_JOIN_NOSPAWNS);
-			return; // spawn failed
-		}
+	this.angles = spot.angles;
+	this.angles_z = 0; // never spawn tilted even if the spot says to
+	if (IS_BOT_CLIENT(this))
+		this.v_angle = this.angles;
+	this.fixangle = true; // turn this way immediately
+	this.oldvelocity = this.velocity = '0 0 0';
+	this.avelocity = '0 0 0';
+	this.punchangle = '0 0 0';
+	this.punchvector = '0 0 0';
 
-		TRANSMUTE(Player, this);
+	this.strength_finished = 0;
+	this.invincible_finished = 0;
+	this.fire_endtime = -1;
+	this.revive_progress = 0;
+	this.revival_time = 0;
+	this.air_finished = time + 12;
 
-		this.wasplayer = true;
-		this.iscreature = true;
-		this.teleportable = TELEPORT_NORMAL;
-		this.damagedbycontents = true;
-		set_movetype(this, MOVETYPE_WALK);
-		this.solid = SOLID_SLIDEBOX;
-		this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;
-		if (autocvar_g_playerclip_collisions)
-			this.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
-		if (IS_BOT_CLIENT(this) && autocvar_g_botclip_collisions)
-			this.dphitcontentsmask |= DPCONTENTS_BOTCLIP;
-		this.frags = FRAGS_PLAYER;
-		if (INDEPENDENT_PLAYERS) MAKE_INDEPENDENT_PLAYER(this);
-		this.flags = FL_CLIENT | FL_PICKUPITEMS;
-		if (autocvar__notarget)
-			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;
-			this.ammo_nails = warmup_start_ammo_nails;
-			this.ammo_rockets = warmup_start_ammo_rockets;
-			this.ammo_cells = warmup_start_ammo_cells;
-			this.ammo_plasma = warmup_start_ammo_plasma;
-			this.ammo_fuel = warmup_start_ammo_fuel;
-			this.health = warmup_start_health;
-			this.armorvalue = warmup_start_armorvalue;
-			this.weapons = WARMUP_START_WEAPONS;
-		} else {
-			this.ammo_shells = start_ammo_shells;
-			this.ammo_nails = start_ammo_nails;
-			this.ammo_rockets = start_ammo_rockets;
-			this.ammo_cells = start_ammo_cells;
-			this.ammo_plasma = start_ammo_plasma;
-			this.ammo_fuel = start_ammo_fuel;
-			this.health = start_health;
-			this.armorvalue = start_armorvalue;
-			this.weapons = start_weapons;
-		}
-		SetSpectatee_status(this, 0);
-
-		this.superweapons_finished = (this.weapons & WEPSET_SUPERWEAPONS) ? time + autocvar_g_balance_superweapons_time : 0;
-
-		this.items = start_items;
-
-		this.spawnshieldtime = time + autocvar_g_spawnshieldtime;
-		this.pauserotarmor_finished = time + autocvar_g_balance_pause_armor_rot_spawn;
-		this.pauserothealth_finished = time + autocvar_g_balance_pause_health_rot_spawn;
-		this.pauserotfuel_finished = time + autocvar_g_balance_pause_fuel_rot_spawn;
-		this.pauseregen_finished = time + autocvar_g_balance_pause_health_regen_spawn;
-		// extend the pause of rotting if client was reset at the beginning of the countdown
-		if (!autocvar_sv_ready_restart_after_countdown && time < game_starttime) { // TODO why is this cvar NOTted?
-			float f = game_starttime - time;
-			this.spawnshieldtime += f;
-			this.pauserotarmor_finished += f;
-			this.pauserothealth_finished += f;
-			this.pauseregen_finished += f;
-		}
-		this.damageforcescale = 2;
-		this.death_time = 0;
-		this.respawn_flags = 0;
-		this.respawn_time = 0;
-		this.stat_respawn_time = 0;
-		this.scale = autocvar_sv_player_scale;
-		this.fade_time = 0;
-		this.pain_frame = 0;
-		this.pain_finished = 0;
-		this.pushltime = 0;
-		setthink(this, func_null); // players have no think function
-		this.nextthink = 0;
-		this.dmg_team = 0;
-		this.ballistics_density = autocvar_g_ballistics_density_player;
-
-		this.deadflag = DEAD_NO;
-
-		this.angles = spot.angles;
-		this.angles_z = 0; // never spawn tilted even if the spot says to
-		if (IS_BOT_CLIENT(this))
-			this.v_angle = this.angles;
-		this.fixangle = true; // turn this way immediately
-		this.oldvelocity = this.velocity = '0 0 0';
-		this.avelocity = '0 0 0';
-		this.punchangle = '0 0 0';
-		this.punchvector = '0 0 0';
-
-		this.strength_finished = 0;
-		this.invincible_finished = 0;
-		this.fire_endtime = -1;
-		this.revival_time = 0;
-		this.air_finished = time + 12;
-
-		entity spawnevent = new_pure(spawnevent);
-		spawnevent.owner = this;
-		Net_LinkEntity(spawnevent, false, 0.5, SpawnEvent_Send);
-
-		// Cut off any still running player sounds.
-		stopsound(this, CH_PLAYER_SINGLE);
-
-		this.model = "";
-		FixPlayermodel(this);
-		this.drawonlytoclient = NULL;
-
-		this.crouch = false;
-		this.view_ofs = STAT(PL_VIEW_OFS, NULL);
-		setsize(this, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL));
-		this.spawnorigin = spot.origin;
-		setorigin(this, spot.origin + '0 0 1' * (1 - this.mins.z - 24));
-		// don't reset back to last position, even if new position is stuck in solid
-		this.oldorigin = this.origin;
-		this.prevorigin = this.origin;
-		this.lastteleporttime = time; // prevent insane speeds due to changing origin
-		if(this.conveyor)
-			IL_REMOVE(g_conveyed, this);
-		this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
-		this.hud = HUD_NORMAL;
+	entity spawnevent = new_pure(spawnevent);
+	spawnevent.owner = this;
+	Net_LinkEntity(spawnevent, false, 0.5, SpawnEvent_Send);
 
-		this.event_damage = PlayerDamage;
+	// Cut off any still running player sounds.
+	stopsound(this, CH_PLAYER_SINGLE);
 
-		if(!this.bot_attack)
-			IL_PUSH(g_bot_targets, this);
-		this.bot_attack = true;
-		this.monster_attack = true;
+	this.model = "";
+	FixPlayermodel(this);
+	this.drawonlytoclient = NULL;
 
-		PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false;
+	this.viewloc = NULL;
 
-		if (this.killcount == FRAGS_SPECTATOR) {
-			PlayerScore_Clear(this);
-			this.killcount = 0;
-		}
+	this.crouch = false;
+	this.view_ofs = STAT(PL_VIEW_OFS, this);
+	setsize(this, STAT(PL_MIN, this), STAT(PL_MAX, this));
+	this.spawnorigin = spot.origin;
+	setorigin(this, spot.origin + '0 0 1' * (1 - this.mins.z - 24));
+	// don't reset back to last position, even if new position is stuck in solid
+	this.oldorigin = this.origin;
+	this.prevorigin = this.origin;
+	this.lastteleporttime = time; // prevent insane speeds due to changing origin
+	if(this.conveyor)
+		IL_REMOVE(g_conveyed, this);
+	this.conveyor = NULL; // prevent conveyors at the previous location from moving a freshly spawned player
+	this.hud = HUD_NORMAL;
+
+	this.event_damage = PlayerDamage;
+
+	if(!this.bot_attack)
+		IL_PUSH(g_bot_targets, this);
+	this.bot_attack = true;
+	if(!this.monster_attack)
+		IL_PUSH(g_monster_targets, this);
+	this.monster_attack = true;
+	navigation_dynamicgoal_init(this, false);
+
+	PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_JUMP(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false;
+
+	if (this.killcount == FRAGS_SPECTATOR) {
+		PlayerScore_Clear(this);
+		this.killcount = 0;
+	}
 
-		for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-		{
-			CL_SpawnWeaponentity(this, weaponentities[slot]);
-		}
-		this.alpha = default_player_alpha;
-		this.colormod = '1 1 1' * autocvar_g_player_brightness;
-		this.exteriorweaponentity.alpha = default_weapon_alpha;
+	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		entity oldwep = this.(weaponentity);
+		CL_SpawnWeaponentity(this, weaponentity);
+		if(oldwep && oldwep.owner == this)
+			this.(weaponentity).m_gunalign = oldwep.m_gunalign;
+	}
+	this.alpha = default_player_alpha;
+	this.colormod = '1 1 1' * autocvar_g_player_brightness;
+	this.exteriorweaponentity.alpha = default_weapon_alpha;
 
-		this.speedrunning = false;
+	this.speedrunning = false;
 
-		target_voicescript_clear(this);
+	target_voicescript_clear(this);
 
-		// reset fields the weapons may use
-		FOREACH(Weapons, true, LAMBDA(
-			it.wr_resetplayer(it, this);
+	// reset fields the weapons may use
+	FOREACH(Weapons, true, LAMBDA(
+		it.wr_resetplayer(it, this);
 			// reload all reloadable weapons
-			if (it.spawnflags & WEP_FLAG_RELOADABLE) {
-				this.weapon_load[it.m_id] = it.reloading_ammo;
+		if (it.spawnflags & WEP_FLAG_RELOADABLE) {
+			for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+			{
+				.entity weaponentity = weaponentities[slot];
+				this.(weaponentity).weapon_load[it.m_id] = it.reloading_ammo;
 			}
-		));
-
-		{
-			string s = spot.target;
-			spot.target = string_null;
-			SUB_UseTargets(spot, this, NULL);
-			spot.target = s;
 		}
+	));
+
+	{
+		string s = spot.target;
+		spot.target = string_null;
+		SUB_UseTargets(spot, this, NULL);
+		spot.target = s;
+	}
 
-		Unfreeze(this);
+	Unfreeze(this);
 
-		MUTATOR_CALLHOOK(PlayerSpawn, this, spot);
+	MUTATOR_CALLHOOK(PlayerSpawn, this, spot);
 
-		if (autocvar_spawn_debug)
-		{
-			sprint(this, strcat("spawnpoint origin:  ", vtos(spot.origin), "\n"));
-			delete(spot); // usefull for checking if there are spawnpoints, that let drop through the floor
-		}
+	if (autocvar_spawn_debug)
+	{
+		sprint(this, strcat("spawnpoint origin:  ", vtos(spot.origin), "\n"));
+		delete(spot); // usefull for checking if there are spawnpoints, that let drop through the floor
+	}
 
-		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-		{
-			.entity weaponentity = weaponentities[slot];
-			if(slot == 0)
-				this.(weaponentity).m_switchweapon = w_getbestweapon(this);
-			else
-				this.(weaponentity).m_switchweapon = WEP_Null;
-			this.(weaponentity).weaponname = "";
-			this.(weaponentity).m_switchingweapon = WEP_Null;
-		}
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		if(slot == 0 || autocvar_g_weaponswitch_debug == 1)
+			this.(weaponentity).m_switchweapon = w_getbestweapon(this, weaponentity);
+		else
+			this.(weaponentity).m_switchweapon = WEP_Null;
+		this.(weaponentity).m_weapon = WEP_Null;
+		this.(weaponentity).weaponname = "";
+		this.(weaponentity).m_switchingweapon = WEP_Null;
+		this.(weaponentity).cnt = -1;
+	}
+
+	MUTATOR_CALLHOOK(PlayerWeaponSelect, this);
 
-		this.cnt = -1; // TODO
+	if (!warmup_stage && !this.alivetime)
+		this.alivetime = time;
 
-		if (!warmup_stage && !this.alivetime)
-			this.alivetime = time;
+	antilag_clear(this, CS(this));
+}
 
-		antilag_clear(this, CS(this));
+/** Called when a client spawns in the server */
+void PutClientInServer(entity this)
+{
+	if (IS_BOT_CLIENT(this)) {
+		TRANSMUTE(Player, this);
+	} else if (IS_REAL_CLIENT(this)) {
+		msg_entity = this;
+		WriteByte(MSG_ONE, SVC_SETVIEW);
+		WriteEntity(MSG_ONE, this);
+	}
+	if (game_stopped)
+		TRANSMUTE(Observer, this);
+
+	SetSpectatee(this, NULL);
+
+	// reset player keys
+	this.itemkeys = 0;
+
+	MUTATOR_CALLHOOK(PutClientInServer, this);
+
+	if (IS_OBSERVER(this)) {
+		PutObserverInServer(this);
+	} else if (IS_PLAYER(this)) {
+		PutPlayerInServer(this);
 	}
 }
 
 void ClientInit_misc(entity this);
 
-.float ebouncefactor, ebouncestop; // electro's values
 // TODO do we need all these fields, or should we stop autodetecting runtime
 // changes and just have a console command to update this?
 bool ClientInit_SendEntity(entity this, entity to, int sf)
@@ -792,7 +821,7 @@ SetChangeParms
 void SetChangeParms (entity this)
 {
 	// save parms for level change
-	parm1 = this.parm_idlesince - time;
+	parm1 = CS(this).parm_idlesince - time;
 
 	MUTATOR_CALLHOOK(SetChangeParms);
 }
@@ -805,12 +834,12 @@ DecodeLevelParms
 void DecodeLevelParms(entity this)
 {
 	// load parms
-	this.parm_idlesince = parm1;
-	if (this.parm_idlesince == -(86400 * 366))
-		this.parm_idlesince = time;
+	CS(this).parm_idlesince = parm1;
+	if (CS(this).parm_idlesince == -(86400 * 366))
+		CS(this).parm_idlesince = time;
 
 	// whatever happens, allow 60 seconds of idling directly after connect for map loading
-	this.parm_idlesince = max(this.parm_idlesince, time - sv_maxidle + 60);
+	CS(this).parm_idlesince = max(CS(this).parm_idlesince, time - sv_maxidle + 60);
 
 	MUTATOR_CALLHOOK(DecodeLevelParms);
 }
@@ -826,19 +855,19 @@ Called when a client types 'kill' in the console
 .float clientkill_nexttime;
 void ClientKill_Now_TeamChange(entity this)
 {
-	if(this.killindicator_teamchange == -1)
+	if(CS(this).killindicator_teamchange == -1)
 	{
 		JoinBestTeam( this, false, true );
 	}
-	else if(this.killindicator_teamchange == -2)
+	else if(CS(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, this.killindicator_teamchange - 1);
-	this.killindicator_teamchange = 0;
+		SV_ChangeTeam(this, CS(this).killindicator_teamchange - 1);
+	CS(this).killindicator_teamchange = 0;
 }
 
 void ClientKill_Now(entity this)
@@ -846,7 +875,7 @@ void ClientKill_Now(entity this)
 	if(this.vehicle)
 	{
 	    vehicles_exit(this.vehicle, VHEF_RELEASE);
-	    if(!this.killindicator_teamchange)
+	    if(!CS(this).killindicator_teamchange)
 	    {
             this.vehicle_health = -1;
             Damage(this, this, this, 1 , DEATH_KILL.m_id, this.origin, '0 0 0');
@@ -858,7 +887,7 @@ void ClientKill_Now(entity this)
 
 	this.killindicator = NULL;
 
-	if(this.killindicator_teamchange)
+	if(CS(this).killindicator_teamchange)
 		ClientKill_Now_TeamChange(this);
 
 	if(!IS_SPEC(this) && !IS_OBSERVER(this))
@@ -868,7 +897,7 @@ void ClientKill_Now(entity this)
 }
 void KillIndicator_Think(entity this)
 {
-	if (gameover)
+	if (game_stopped)
 	{
 		this.owner.killindicator = NULL;
 		delete(this);
@@ -887,7 +916,7 @@ void KillIndicator_Think(entity this)
 		ClientKill_Now(this.owner);
 		return;
 	}
-    else if(g_cts && this.health == 1) // health == 1 means that it's silent
+    else if(this.health == 1) // health == 1 means that it's silent
     {
         this.nextthink = time + 1;
         this.cnt -= 1;
@@ -912,18 +941,16 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
 	float killtime;
 	float starttime;
 
-	if (gameover)
+	if (game_stopped)
 		return;
 
 	killtime = autocvar_g_balance_kill_delay;
 
-	if(g_race_qualifying || g_cts)
-		killtime = 0;
-
     if(MUTATOR_CALLHOOK(ClientKill, this, killtime))
     	return;
+    killtime = M_ARGV(1, float);
 
-	this.killindicator_teamchange = targetteam;
+	CS(this).killindicator_teamchange = targetteam;
 
     if(!this.killindicator)
 	{
@@ -1004,7 +1031,7 @@ void ClientKill_TeamChange (entity this, float targetteam) // 0 = don't change,
 
 void ClientKill (entity this)
 {
-	if(gameover) return;
+	if(game_stopped) return;
 	if(this.player_blocked) return;
 	if(STAT(FROZEN, this)) return;
 
@@ -1020,28 +1047,44 @@ void FixClientCvars(entity e)
 	if(autocvar_sv_gentle)
 		stuffcmd(e, "cl_cmd settemp cl_gentle 1\n");
 
+	stuffcmd(e, sprintf("\ncl_jumpspeedcap_min \"%s\"\n", autocvar_sv_jumpspeedcap_min));
+	stuffcmd(e, sprintf("\ncl_jumpspeedcap_max \"%s\"\n", autocvar_sv_jumpspeedcap_max));
+
 	MUTATOR_CALLHOOK(FixClientCvars, e);
 }
 
-float PlayerInIDList(entity p, string idlist)
+bool findinlist_abbrev(string tofind, string list)
+{
+	// this function allows abbreviated strings!
+	FOREACH_WORD(list, it == substring(tofind, 0, strlen(it)),
+	{
+		return true;
+	});
+
+	return false;
+}
+
+bool PlayerInIPList(entity p, string iplist)
 {
-	float n, i;
-	string s;
+	// some safety checks (never allow local?)
+	if(p.netaddress == "local" || p.netaddress == "" || !IS_REAL_CLIENT(p))
+		return false;
+
+	return findinlist_abbrev(p.netaddress, iplist);
+}
 
+bool PlayerInIDList(entity p, string idlist)
+{
 	// NOTE: we do NOT check crypto_idfp_signed here, an unsigned ID is fine too for this
-	if (!p.crypto_idfp)
-		return 0;
+	if(!p.crypto_idfp)
+		return false;
 
-	// this function allows abbreviated player IDs too!
-	n = tokenize_console(idlist);
-	for(i = 0; i < n; ++i)
-	{
-		s = argv(i);
-		if(s == substring(p.crypto_idfp, 0, strlen(s)))
-			return 1;
-	}
+	return findinlist_abbrev(p.crypto_idfp, idlist);
+}
 
-	return 0;
+bool PlayerInList(entity player, string list)
+{
+	return PlayerInIDList(player, list) || PlayerInIPList(player, list);
 }
 
 #ifdef DP_EXT_PRECONNECT
@@ -1052,8 +1095,8 @@ ClientPreConnect
 Called once (not at each match start) when a client begins a connection to the server
 =============
 */
-void ClientPreConnect ()
-{ENGINE_EVENT();
+void ClientPreConnect(entity this)
+{
 	if(autocvar_sv_eventlog)
 	{
 		GameLogEcho(sprintf(":connect:%d:%d:%s",
@@ -1100,10 +1143,10 @@ void ClientConnect(entity this)
 			}
 		}
 	}
-	else if (PlayerInIDList(this, autocvar_g_forced_team_red))    this.team_forced = NUM_TEAM_1;
-	else if (PlayerInIDList(this, autocvar_g_forced_team_blue))   this.team_forced = NUM_TEAM_2;
-	else if (PlayerInIDList(this, autocvar_g_forced_team_yellow)) this.team_forced = NUM_TEAM_3;
-	else if (PlayerInIDList(this, autocvar_g_forced_team_pink))   this.team_forced = NUM_TEAM_4;
+	else if (PlayerInList(this, autocvar_g_forced_team_red))    this.team_forced = NUM_TEAM_1;
+	else if (PlayerInList(this, autocvar_g_forced_team_blue))   this.team_forced = NUM_TEAM_2;
+	else if (PlayerInList(this, autocvar_g_forced_team_yellow)) this.team_forced = NUM_TEAM_3;
+	else if (PlayerInList(this, autocvar_g_forced_team_pink))   this.team_forced = NUM_TEAM_4;
 	else switch (autocvar_g_forced_team_otherwise)
 	{
 		default: this.team_forced = 0; break;
@@ -1142,7 +1185,7 @@ void ClientConnect(entity this)
     if (IS_BOT_CLIENT(this)) PlayerStats_GameReport_AddPlayer(this);
 
 	if (autocvar_sv_eventlog)
-		GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? this.netaddress : "bot"), ":", this.netname));
+		GameLogEcho(strcat(":join:", ftos(this.playerid), ":", ftos(etof(this)), ":", ((IS_REAL_CLIENT(this)) ? this.netaddress : "bot"), ":", playername(this, false)));
 
 	LogTeamchange(this.playerid, this.team, 1);
 
@@ -1192,12 +1235,6 @@ void ClientConnect(entity this)
 
 	if (IS_REAL_CLIENT(this))
 	{
-		if (!autocvar_g_campaign)
-		{
-			this.motd_actived_time = -1;
-			Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage(this));
-		}
-
 		if (g_weaponarena_weapons == WEPSET(TUBA))
 			stuffcmd(this, "cl_cmd settemp chase_active 1\n");
 	}
@@ -1206,7 +1243,7 @@ void ClientConnect(entity this)
 		stuffcmd(this, strcat("\nfog ", world.fog, "\nr_fog_exp2 0\nr_drawfog 1\n"));
 
 	if (autocvar_sv_teamnagger && !(autocvar_bot_vs_human && AvailableTeams() == 2))
-		if (!g_ca && !g_cts && !g_race) // teamnagger is currently bad for ca, race & cts
+		if(!MUTATOR_CALLHOOK(HideTeamNagger, this))
 			send_CSQC_teamnagger();
 
 	CSQCMODEL_AUTOINIT(this);
@@ -1216,11 +1253,25 @@ void ClientConnect(entity this)
 	if (IS_REAL_CLIENT(this))
 		sv_notice_join(this);
 
+	// update physics stats (players can spawn before physics runs)
+	STAT(MOVEVARS_HIGHSPEED, this) = autocvar_g_movement_highspeed;
+	MUTATOR_CALLHOOK(PlayerPhysics_UpdateStats, this); // do it BEFORE the function so we can modify highspeed!
+	Physics_UpdateStats(this, PHYS_HIGHSPEED(this));
+
 	IL_EACH(g_initforplayer, it.init_for_player, {
 		it.init_for_player(it, this);
 	});
 
 	MUTATOR_CALLHOOK(ClientConnect, this);
+
+	if (IS_REAL_CLIENT(this))
+	{
+		if (!autocvar_g_campaign && !IS_PLAYER(this))
+		{
+			this.motd_actived_time = -1;
+			Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_MOTD, getwelcomemessage(this));
+		}
+	}
 }
 /*
 =============
@@ -1245,7 +1296,8 @@ void ClientDisconnect(entity this)
 
 	Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_QUIT_DISCONNECT, this.netname);
 
-	SetSpectatee(this, NULL);
+	if(IS_SPEC(this))
+		SetSpectatee(this, NULL);
 
     MUTATOR_CALLHOOK(ClientDisconnect, this);
 
@@ -1255,7 +1307,7 @@ void ClientDisconnect(entity this)
 
 	Unfreeze(this);
 
-	RemoveGrapplingHook(this);
+	RemoveGrapplingHooks(this);
 
 	// Here, everything has been done that requires this player to be a client.
 
@@ -1276,6 +1328,8 @@ void ClientDisconnect(entity this)
 	this.playerid = 0;
 	ReadyCount();
 	if (vote_called && IS_REAL_CLIENT(this)) VoteCount(false);
+
+	ONREMOVE(this);
 }
 
 void ChatBubbleThink(entity this)
@@ -1378,7 +1432,7 @@ void player_powerups(entity this)
 	// add a way to see what the items were BEFORE all of these checks for the mutator hook
 	int items_prev = this.items;
 
-	if((this.items & IT_USING_JETPACK) && !IS_DEAD(this) && !gameover)
+	if((this.items & IT_USING_JETPACK) && !IS_DEAD(this) && !game_stopped)
 		this.modelflags |= MF_ROCKET;
 	else
 		this.modelflags &= ~MF_ROCKET;
@@ -1409,7 +1463,8 @@ void player_powerups(entity this)
 			if (time < this.strength_finished)
 			{
 				this.items = this.items | ITEM_Strength.m_itemid;
-				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_STRENGTH, this.netname);
+				if(!g_cts)
+					Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_STRENGTH, this.netname);
 				Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERUP_STRENGTH);
 			}
 		}
@@ -1429,7 +1484,8 @@ void player_powerups(entity this)
 			if (time < this.invincible_finished)
 			{
 				this.items = this.items | ITEM_Shield.m_itemid;
-				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_SHIELD, this.netname);
+				if(!g_cts)
+					Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_POWERUP_SHIELD, this.netname);
 				Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_POWERUP_SHIELD);
 			}
 		}
@@ -1463,7 +1519,8 @@ void player_powerups(entity this)
 			if (time < this.superweapons_finished || (this.items & IT_UNLIMITED_SUPERWEAPONS))
 			{
 				this.items = this.items | IT_SUPERWEAPON;
-				Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_SUPERWEAPON_PICKUP, this.netname);
+				if(!g_cts)
+					Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_SUPERWEAPON_PICKUP, this.netname);
 				Send_Notification(NOTIF_ONE, this, MSG_CENTER, CENTER_SUPERWEAPON_PICKUP);
 			}
 			else
@@ -1602,11 +1659,11 @@ void player_regen(entity this)
 }
 
 bool zoomstate_set;
-void SetZoomState(entity this, float z)
+void SetZoomState(entity this, float newzoom)
 {
-	if(z != this.zoomstate)
+	if(newzoom != this.zoomstate)
 	{
-		this.zoomstate = z;
+		this.zoomstate = newzoom;
 		ClientData_Touch(this);
 	}
 	zoomstate_set = true;
@@ -1615,7 +1672,7 @@ void SetZoomState(entity this, float z)
 void GetPressedKeys(entity this)
 {
 	MUTATOR_CALLHOOK(GetPressedKeys, this);
-	int keys = this.pressedkeys;
+	int keys = STAT(PRESSED_KEYS, this);
 	keys = BITSET(keys, KEY_FORWARD, 	this.movement.x > 0);
 	keys = BITSET(keys, KEY_BACKWARD, 	this.movement.x < 0);
 	keys = BITSET(keys, KEY_RIGHT, 		this.movement.y > 0);
@@ -1625,7 +1682,9 @@ void GetPressedKeys(entity this)
 	keys = BITSET(keys, KEY_CROUCH, 	PHYS_INPUT_BUTTON_CROUCH(this));
 	keys = BITSET(keys, KEY_ATCK, 		PHYS_INPUT_BUTTON_ATCK(this));
 	keys = BITSET(keys, KEY_ATCK2, 		PHYS_INPUT_BUTTON_ATCK2(this));
-	this.pressedkeys = keys;
+	this.pressedkeys = keys; // store for other users
+
+	STAT(PRESSED_KEYS, this) = keys;
 }
 
 /*
@@ -1652,14 +1711,16 @@ void SpectateCopy(entity this, entity spectatee)
 	this.clip_size = spectatee.clip_size;
 	this.effects = spectatee.effects & EFMASK_CHEAP; // eat performance
 	this.health = spectatee.health;
-	this.impulse = 0;
+	CS(this).impulse = 0;
 	this.items = spectatee.items;
 	this.last_pickup = spectatee.last_pickup;
 	this.hit_time = spectatee.hit_time;
 	this.strength_finished = spectatee.strength_finished;
 	this.invincible_finished = spectatee.invincible_finished;
-	this.pressedkeys = spectatee.pressedkeys;
+	this.superweapons_finished = spectatee.superweapons_finished;
+	STAT(PRESSED_KEYS, this) = STAT(PRESSED_KEYS, spectatee);
 	this.weapons = spectatee.weapons;
+	this.dual_weapons = spectatee.dual_weapons;
 	this.vortex_charge = spectatee.vortex_charge;
 	this.vortex_chargepool_ammo = spectatee.vortex_chargepool_ammo;
 	this.hagar_load = spectatee.hagar_load;
@@ -1675,12 +1736,24 @@ void SpectateCopy(entity this, entity spectatee)
 	this.angles = spectatee.v_angle;
 	STAT(FROZEN, this) = STAT(FROZEN, spectatee);
 	this.revive_progress = spectatee.revive_progress;
+	this.viewloc = spectatee.viewloc;
 	if(!PHYS_INPUT_BUTTON_USE(this) && STAT(CAMERA_SPECTATOR, this) != 2)
 		this.fixangle = true;
 	setorigin(this, spectatee.origin);
 	setsize(this, spectatee.mins, spectatee.maxs);
 	SetZoomState(this, spectatee.zoomstate);
 
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		this.(weaponentity) = spectatee.(weaponentity);
+	}
+
+	for(int slot = 0; slot < MAX_AXH; ++slot)
+	{
+		this.(AuxiliaryXhair[slot]) = spectatee.(AuxiliaryXhair[slot]);
+	}
+
     anticheat_spectatecopy(this, spectatee);
 	this.hud = spectatee.hud;
 	if(spectatee.vehicle)
@@ -1760,6 +1833,9 @@ void SetSpectatee_status(entity this, int spectatee_num)
 
 void SetSpectatee(entity this, entity spectatee)
 {
+	if(IS_BOT_CLIENT(this))
+		return; // bots abuse .enemy, this code is useless to them
+
 	entity old_spectatee = this.enemy;
 
 	this.enemy = spectatee;
@@ -1900,6 +1976,7 @@ void Join(entity this)
 
 	PutClientInServer(this);
 
+	if(IS_PLAYER(this))
 	if(teamplay && this.team != -1)
 		Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_JOIN_PLAY_TEAM), this.netname);
 	else
@@ -2031,10 +2108,10 @@ bool joinAllowed(entity this)
 
 void ObserverThink(entity this)
 {
-	if ( this.impulse )
+	if ( CS(this).impulse )
 	{
-		MinigameImpulse(this, this.impulse);
-		this.impulse = 0;
+		MinigameImpulse(this, CS(this).impulse);
+		CS(this).impulse = 0;
 	}
 
 	if (this.flags & FL_JUMPRELEASED) {
@@ -2065,15 +2142,15 @@ void ObserverThink(entity this)
 
 void SpectatorThink(entity this)
 {
-	if ( this.impulse )
+	if ( CS(this).impulse )
 	{
-		if(MinigameImpulse(this, this.impulse))
-			this.impulse = 0;
+		if(MinigameImpulse(this, CS(this).impulse))
+			CS(this).impulse = 0;
 
-		if (this.impulse == IMP_weapon_drop.impulse)
+		if (CS(this).impulse == IMP_weapon_drop.impulse)
 		{
 			STAT(CAMERA_SPECTATOR, this) = (STAT(CAMERA_SPECTATOR, this) + 1) % 3;
-			this.impulse = 0;
+			CS(this).impulse = 0;
 			return;
 		}
 	}
@@ -2082,7 +2159,7 @@ void SpectatorThink(entity this)
 		if (PHYS_INPUT_BUTTON_JUMP(this) && joinAllowed(this)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			this.flags |= FL_SPAWNING;
-		} else if(PHYS_INPUT_BUTTON_ATCK(this) || this.impulse == 10 || this.impulse == 15 || this.impulse == 18 || (this.impulse >= 200 && this.impulse <= 209)) {
+		} else if(PHYS_INPUT_BUTTON_ATCK(this) || CS(this).impulse == 10 || CS(this).impulse == 15 || CS(this).impulse == 18 || (CS(this).impulse >= 200 && CS(this).impulse <= 209)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			if(SpectateNext(this)) {
 				TRANSMUTE(Spectator, this);
@@ -2090,8 +2167,8 @@ void SpectatorThink(entity this)
 				TRANSMUTE(Observer, this);
 				PutClientInServer(this);
 			}
-			this.impulse = 0;
-		} else if(this.impulse == 12 || this.impulse == 16  || this.impulse == 19 || (this.impulse >= 220 && this.impulse <= 229)) {
+			CS(this).impulse = 0;
+		} else if(CS(this).impulse == 12 || CS(this).impulse == 16  || CS(this).impulse == 19 || (CS(this).impulse >= 220 && CS(this).impulse <= 229)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			if(SpectatePrev(this)) {
 				TRANSMUTE(Spectator, this);
@@ -2099,7 +2176,7 @@ void SpectatorThink(entity this)
 				TRANSMUTE(Observer, this);
 				PutClientInServer(this);
 			}
-			this.impulse = 0;
+			CS(this).impulse = 0;
 		} else if (PHYS_INPUT_BUTTON_ATCK2(this)) {
 			this.flags &= ~FL_JUMPRELEASED;
 			TRANSMUTE(Observer, this);
@@ -2133,7 +2210,7 @@ void PlayerUseKey(entity this)
 
 	if(this.vehicle)
 	{
-		if(!gameover)
+		if(!game_stopped)
 		{
 			vehicles_exit(this.vehicle, VHEF_NORMAL);
 			return;
@@ -2143,7 +2220,7 @@ void PlayerUseKey(entity this)
 	{
 		if(!STAT(FROZEN, this))
 		if(!IS_DEAD(this))
-		if(!gameover)
+		if(!game_stopped)
 		{
 			entity head, closest_target = NULL;
 			head = WarpZone_FindRadius(this.origin, autocvar_g_vehicles_enter_radius, true);
@@ -2216,7 +2293,7 @@ void PlayerPreThink (entity this)
 	}
 	if (this.netname != this.netname_previous) {
 		if (autocvar_sv_eventlog) {
-			GameLogEcho(strcat(":name:", ftos(this.playerid), ":", this.netname));
+			GameLogEcho(strcat(":name:", ftos(this.playerid), ":", playername(this, false)));
         }
 		if (this.netname_previous) strunzone(this.netname_previous);
 		this.netname_previous = strzone(this.netname);
@@ -2274,7 +2351,7 @@ void PlayerPreThink (entity this)
 
 	MUTATOR_CALLHOOK(PlayerPreThink, this);
 
-	if(autocvar_g_vehicles_enter && (time > this.last_vehiclecheck) && !gameover && !this.vehicle)
+	if(autocvar_g_vehicles_enter && (time > this.last_vehiclecheck) && !game_stopped && !this.vehicle)
 	if(IS_PLAYER(this) && !STAT(FROZEN, this) && !IS_DEAD(this))
 	{
 		FOREACH_ENTITY_RADIUS(this.origin, autocvar_g_vehicles_enter_radius, IS_VEHICLE(it),
@@ -2309,8 +2386,10 @@ void PlayerPreThink (entity this)
 	if (IS_PLAYER(this)) {
 		CheckRules_Player(this);
 
-		if (intermission_running) {
-			IntermissionThink(this);
+		if (game_stopped || intermission_running) {
+			this.modelflags &= ~MF_ROCKET;
+			if(intermission_running)
+				IntermissionThink(this);
 			return;
 		}
 
@@ -2329,10 +2408,17 @@ void PlayerPreThink (entity this)
 				if (time > this.respawn_time) {
 					STAT(RESPAWN_TIME, this) = this.respawn_time = time + 1; // only retry once a second
 					respawn(this);
-					this.impulse = CHIMPULSE_SPEEDRUN.impulse;
+					CS(this).impulse = CHIMPULSE_SPEEDRUN.impulse;
 				}
 			} else {
 				if (frametime) player_anim(this);
+
+				if (this.respawn_flags & RESPAWN_DENY)
+				{
+					STAT(RESPAWN_TIME, this) = 0;
+					return;
+				}
+
 				bool button_pressed = (PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this) || PHYS_INPUT_BUTTON_ATCK2(this) || PHYS_INPUT_BUTTON_HOOK(this) || PHYS_INPUT_BUTTON_USE(this));
 
 				switch(this.deadflag)
@@ -2395,8 +2481,18 @@ void PlayerPreThink (entity this)
 
 		this.prevorigin = this.origin;
 
+		bool have_hook = false;
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if(this.(weaponentity).hook.state)
+			{
+				have_hook = true;
+				break;
+			}
+		}
 		bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
-		if (this.hook.state) {
+		if (have_hook) {
 			do_crouch = false;
 		} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
 			do_crouch = false;
@@ -2433,6 +2529,12 @@ void PlayerPreThink (entity this)
 			{
 				.entity weaponentity = weaponentities[slot];
 				W_WeaponFrame(this, weaponentity);
+
+				if(slot == 0)
+				{
+					this.clip_load = this.(weaponentity).clip_load;
+					this.clip_size = this.(weaponentity).clip_size;
+				}
 			}
 
 			this.items_added = 0;
@@ -2446,8 +2548,12 @@ void PlayerPreThink (entity this)
 
 		// WEAPONTODO: Add a weapon request for this
 		// rot vortex charge to the charge limit
-		if (WEP_CVAR(vortex, charge_rot_rate) && this.vortex_charge > WEP_CVAR(vortex, charge_limit) && this.vortex_charge_rottime < time)
-			this.vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			if (WEP_CVAR(vortex, charge_rot_rate) && this.(weaponentity).vortex_charge > WEP_CVAR(vortex, charge_limit) && this.(weaponentity).vortex_charge_rottime < time)
+				this.(weaponentity).vortex_charge = bound(WEP_CVAR(vortex, charge_limit), this.(weaponentity).vortex_charge - WEP_CVAR(vortex, charge_rot_rate) * frametime / W_TICSPERFRAME, 1);
+		}
 
 		if (frametime) player_anim(this);
 
@@ -2459,8 +2565,9 @@ void PlayerPreThink (entity this)
 
 		this.dmg_team = max(0, this.dmg_team - autocvar_g_teamdamage_resetspeed * frametime);
 	}
-	else if (gameover) {
-		if (intermission_running) IntermissionThink(this);
+	else if (game_stopped || intermission_running) {
+		if(intermission_running)
+			IntermissionThink(this);
 		return;
 	}
 	else if (IS_OBSERVER(this)) {
@@ -2471,13 +2578,16 @@ void PlayerPreThink (entity this)
 	}
 
 	// WEAPONTODO: Add weapon request for this
-	.entity weaponentity = weaponentities[0]; // TODO: unhardcode
 	if (!zoomstate_set) {
-		SetZoomState(this,
-			PHYS_INPUT_BUTTON_ZOOM(this) || PHYS_INPUT_BUTTON_ZOOMSCRIPT(this)
-			|| (PHYS_INPUT_BUTTON_ATCK2(this) && this.(weaponentity).m_weapon == WEP_VORTEX)
-			|| (PHYS_INPUT_BUTTON_ATCK2(this) && this.(weaponentity).m_weapon == WEP_RIFLE && WEP_CVAR(rifle, secondary) == 0)
-		);
+		bool wep_zoomed = false;
+		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		{
+			.entity weaponentity = weaponentities[slot];
+			Weapon thiswep = this.(weaponentity).m_weapon;
+			if(thiswep != WEP_Null && thiswep.wr_zoom)
+				wep_zoomed += thiswep.wr_zoom(thiswep, this);
+		}
+		SetZoomState(this, PHYS_INPUT_BUTTON_ZOOM(this) || PHYS_INPUT_BUTTON_ZOOMSCRIPT(this) || wep_zoomed);
     }
 
 	if (this.teamkill_soundtime && time > this.teamkill_soundtime)
@@ -2500,8 +2610,12 @@ void PlayerPreThink (entity this)
 
 	// WEAPONTODO: Move into weaponsystem somehow
 	// if a player goes unarmed after holding a loaded weapon, empty his clip size and remove the crosshair ammo ring
-	if (this.(weaponentity).m_weapon == WEP_Null)
-		this.clip_load = this.clip_size = 0;
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		if(this.(weaponentity).m_weapon == WEP_Null)
+			this.(weaponentity).clip_load = this.(weaponentity).clip_size = 0;
+	}
 }
 
 void DrownPlayer(entity this)
@@ -2535,12 +2649,12 @@ void Player_Physics(entity this)
 	if(!this.move_qcphysics)
 		return;
 
-	if(!frametime && !this.pm_frametime)
+	if(!frametime && !CS(this).pm_frametime)
 		return;
 
-	Movetype_Physics_NoMatchTicrate(this, this.pm_frametime, true);
+	Movetype_Physics_NoMatchTicrate(this, CS(this).pm_frametime, true);
 
-	this.pm_frametime = 0;
+	CS(this).pm_frametime = 0;
 }
 
 /*
@@ -2550,7 +2664,6 @@ PlayerPostThink
 Called every frame for each client after the physics are run
 =============
 */
-.float idlekick_lasttimeleft;
 void PlayerPostThink (entity this)
 {
 	Player_Physics(this);
@@ -2571,19 +2684,19 @@ void PlayerPostThink (entity this)
 
 		if (sv_maxidle_slots > 0 && (maxclients - totalClients) > sv_maxidle_slots)
 		{ /* do nothing */ }
-		else if (time - this.parm_idlesince < 1) // instead of (time == this.parm_idlesince) to support sv_maxidle <= 10
+		else if (time - CS(this).parm_idlesince < 1) // instead of (time == this.parm_idlesince) to support sv_maxidle <= 10
 		{
-			if (this.idlekick_lasttimeleft)
+			if (CS(this).idlekick_lasttimeleft)
 			{
-				this.idlekick_lasttimeleft = 0;
+				CS(this).idlekick_lasttimeleft = 0;
 				Kill_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CPID_IDLING);
 			}
 		}
 		else
 		{
-			float timeleft = ceil(sv_maxidle - (time - this.parm_idlesince));
+			float timeleft = ceil(sv_maxidle - (time - CS(this).parm_idlesince));
 			if (timeleft == min(10, sv_maxidle - 1)) { // - 1 to support sv_maxidle <= 10
-				if (!this.idlekick_lasttimeleft)
+				if (!CS(this).idlekick_lasttimeleft)
 					Send_Notification(NOTIF_ONE_ONLY, this, MSG_CENTER, CENTER_DISCONNECT_IDLING, timeleft);
 			}
 			if (timeleft <= 0) {
@@ -2592,10 +2705,10 @@ void PlayerPostThink (entity this)
 				return;
 			}
 			else if (timeleft <= 10) {
-				if (timeleft != this.idlekick_lasttimeleft) {
+				if (timeleft != CS(this).idlekick_lasttimeleft) {
 				    Send_Notification(NOTIF_ONE, this, MSG_ANNCE, Announcer_PickNumber(CNT_IDLE, timeleft));
                 }
-				this.idlekick_lasttimeleft = timeleft;
+				CS(this).idlekick_lasttimeleft = timeleft;
 			}
 		}
 	}
@@ -2603,13 +2716,23 @@ void PlayerPostThink (entity this)
 	CheatFrame(this);
 
 	//CheckPlayerJump();
+	if (game_stopped)
+	{
+		this.solid = SOLID_NOT;
+		this.takedamage = DAMAGE_NO;
+		set_movetype(this, MOVETYPE_NONE);
+	}
 
 	if (IS_PLAYER(this)) {
 		DrownPlayer(this);
 		CheckRules_Player(this);
 		UpdateChatBubble(this);
-		if (this.impulse) ImpulseCommands(this);
-		if (intermission_running) return; // intermission or finale
+		if (CS(this).impulse) ImpulseCommands(this);
+		if (game_stopped)
+		{
+			CSQCMODEL_AUTOUPDATE(this);
+			return;
+		}
 		GetPressedKeys(this);
 	}
 
@@ -2622,3 +2745,41 @@ void PlayerPostThink (entity this)
 
 	CSQCMODEL_AUTOUPDATE(this);
 }
+
+// hack to copy the button fields from the client entity to the Client State
+void PM_UpdateButtons(entity this)
+{
+	if(this.impulse)
+		CS(this).impulse = this.impulse;
+	this.impulse = 0;
+
+	CS(this).button0 = this.button0;
+	CS(this).button2 = this.button2;
+	CS(this).button3 = this.button3;
+	CS(this).button4 = this.button4;
+	CS(this).button5 = this.button5;
+	CS(this).button6 = this.button6;
+	CS(this).button7 = this.button7;
+	CS(this).button8 = this.button8;
+	CS(this).button9 = this.button9;
+	CS(this).button10 = this.button10;
+	CS(this).button11 = this.button11;
+	CS(this).button12 = this.button12;
+	CS(this).button13 = this.button13;
+	CS(this).button14 = this.button14;
+	CS(this).button15 = this.button15;
+	CS(this).button16 = this.button16;
+	CS(this).buttonuse = this.buttonuse;
+	CS(this).buttonchat = this.buttonchat;
+
+	CS(this).cursor_active = this.cursor_active;
+	CS(this).cursor_screen = this.cursor_screen;
+	CS(this).cursor_trace_start = this.cursor_trace_start;
+	CS(this).cursor_trace_endpos = this.cursor_trace_endpos;
+	CS(this).cursor_trace_ent = this.cursor_trace_ent;
+
+	// TODO: ping?
+
+	CS(this).v_angle = this.v_angle;
+	CS(this).movement = this.movement;
+}