X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=9d6bcf798d8b3026e6fb542731491923ba99b715;hb=cd5790a770717f937f0cf6d5437eaf3a76787e11;hp=7c3308041e670a8270eca36b9a660a640746a6e0;hpb=19a4a52c42e00347a51b62ff1e5adcadecda31e0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7c3308041..9d6bcf798 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -417,9 +417,6 @@ void PutObserverInServer (void)
 	if(self.vehicle)
 		vehicles_exit(VHEF_RELESE);	    
 
-	if(self.flagcarried)
-		DropFlag(self.flagcarried, world, world);
-
 	WaypointSprite_PlayerDead();
 
 	if not(g_ca)  // don't reset teams when moving a ca player to the spectators
@@ -448,6 +445,7 @@ void PutObserverInServer (void)
 	
 	self.classname = "observer";
 	self.iscreature = FALSE;
+	self.teleportable = TELEPORT_SIMPLE;
 	self.damagedbycontents = FALSE;
 	self.health = -666;
 	self.takedamage = DAMAGE_NO;
@@ -641,7 +639,6 @@ PutClientInServer
 Called when a client spawns in the server
 =============
 */
-//void() ctf_playerchanged;
 
 void PutClientInServer (void)
 {
@@ -698,6 +695,7 @@ void PutClientInServer (void)
 		self.classname = "player";
 		self.wasplayer = TRUE;
 		self.iscreature = TRUE;
+		self.teleportable = TELEPORT_NORMAL;
 		self.damagedbycontents = TRUE;
 		self.movetype = MOVETYPE_WALK;
 		self.solid = SOLID_SLIDEBOX;
@@ -925,9 +923,6 @@ void PutClientInServer (void)
 	} else if(self.classname == "observer") {
 		PutObserverInServer ();
 	}
-
-	//if(g_ctf)
-	//	ctf_playerchanged();
 }
 
 .float ebouncefactor, ebouncestop; // electro's values
@@ -1340,7 +1335,6 @@ ClientConnect
 Called when a client connects to the server
 =============
 */
-//void ctf_clientconnect();
 string ColoredTeamName(float t);
 void DecodeLevelParms (void);
 //void dom_player_join_team(entity pl);
@@ -1512,10 +1506,6 @@ void ClientConnect (void)
 		if(g_arena)
 			Spawnqueue_Insert(self);
 	}
-	/*else if(g_ctf)
-	{
-		ctf_clientconnect();
-	}*/
 
 	attach_entcs();
 
@@ -1597,6 +1587,8 @@ void ClientConnect (void)
         return;
         
     sv_notice_join();
+    
+    MUTATOR_CALLHOOK(ClientConnect);
 }
 /*
 =============
@@ -1651,8 +1643,6 @@ void ClientDisconnect (void)
 	Portal_ClearAll(self);
 
 	RemoveGrapplingHook(self);
-	if(self.flagcarried)
-		DropFlag(self.flagcarried, world, world);
 
 	// Here, everything has been done that requires this player to be a client.
 
@@ -2533,7 +2523,6 @@ void SpectatorThink()
 	self.flags |= FL_CLIENT | FL_NOTARGET;
 }
 
-float ctf_usekey();
 void PlayerUseKey()
 {
 	if(self.classname != "player")
@@ -2546,9 +2535,6 @@ void PlayerUseKey()
 	}
 	
 	// a use key was pressed; call handlers
-	if(ctf_usekey())
-		return;
-
 	MUTATOR_CALLHOOK(PlayerUseKey);
 }
 
@@ -2562,7 +2548,6 @@ Called every frame for each client before the physics are run
 =============
 */
 .float usekeypressed;
-void() ctf_setstatus;
 void() nexball_setstatus;
 .float items_added;
 void PlayerPreThink (void)
@@ -2800,7 +2785,7 @@ void PlayerPreThink (void)
 		self.prevorigin = self.origin;
 
 		if (!self.vehicle)
-		if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x) // prevent crouching if using melee attack
+		if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x && !self.freezetag_frozen) // prevent crouching if using melee attack
 		{
 			if (!self.crouch)
 			{
@@ -2861,9 +2846,6 @@ void PlayerPreThink (void)
 		if(frametime)
 			player_anim();
 
-		if(g_ctf)
-			ctf_setstatus();
-
 		if(g_nexball)
 			nexball_setstatus();