X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=f7be50277e62b0301c1f1fec5c93891537bcf25a;hp=2f424b8a8f49d81bd3b82f7a53181fe05df15aac;hb=06fc7068ee7c4795ad7b8dd6150ebf3481a10485;hpb=b49d3f3ffff847ec761e15fcc6285a736cddcba3

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 2f424b8a8f..f7be50277e 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -582,7 +582,6 @@ void PutObserverInServer (void)
 	}
 
 	DropAllRunes(self);
-	kh_Key_DropAll(self, TRUE);
 
 	Portal_ClearAll(self);
 
@@ -697,6 +696,8 @@ void PutObserverInServer (void)
 	}
 	else
 		self.frags = FRAGS_SPECTATOR;
+
+	MUTATOR_CALLHOOK(MakePlayerObserver);
 }
 
 float RestrictSkin(float s)
@@ -993,7 +994,6 @@ void PutClientInServer (void)
 		}
 
 		self.cnt = WEP_LASER;
-		self.nixnex_lastchange_id = -1;
 
 		CL_SpawnWeaponentity();
 		self.alpha = default_player_alpha;
@@ -1028,8 +1028,8 @@ void PutClientInServer (void)
 		target_voicescript_clear(self);
 
 		// reset fields the weapons may use
-        for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-            weapon_action(j, WR_RESETPLAYER);
+		for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+			weapon_action(j, WR_RESETPLAYER);
 
 		oldself = self;
 		self = spot;
@@ -1037,6 +1037,8 @@ void PutClientInServer (void)
 				SUB_UseTargets();
 			activator = world;
 		self = oldself;
+
+		MUTATOR_CALLHOOK(PlayerSpawn);
 	} else if(self.classname == "observer" || (g_ca && !allowed_to_spawn)) {
 		PutObserverInServer ();
 	}
@@ -1578,7 +1580,7 @@ void ClientDisconnect (void)
 	SoundEntity_Detach(self);
 
 	DropAllRunes(self);
-	kh_Key_DropAll(self, TRUE);
+	MUTATOR_CALLHOOK(ClientDisconnect);
 
 	Portal_ClearAll(self);
 
@@ -2115,7 +2117,8 @@ void SpectateCopy(entity spectatee) {
 	} else
 		update_stats (0, spectatee.cvar_cl_accuracy_data_share * spectatee.stat_hit, spectatee.cvar_cl_accuracy_data_share * spectatee.stat_fired);
 
-	self.kh_state = spectatee.kh_state;
+	other = spectatee;
+	MUTATOR_CALLHOOK(SpectateCopy);
 	self.armortype = spectatee.armortype;
 	self.armorvalue = spectatee.armorvalue;
 	self.ammo_cells = spectatee.ammo_cells;
@@ -2508,8 +2511,6 @@ void PlayerPreThink (void)
 			self.effects = self.effects - (self.effects & EF_NODRAW);
 		}
 
-		Nixnex_GiveCurrentWeapon();
-
 		if(frametime > 0) // don't do this in cl_movement frames, just in server ticks
 			UpdateSelectedPlayer();