X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=671771bcb37e580f6e77780ce36123e1f1d95763;hb=5b6514ad570d0210590f6fb10b6abd26df38cbd8;hp=287a9e1e76a203329ca0dd315591532b1b5799d4;hpb=5f79dd91c2e1f17b1b1b93882696fd99fdefacc2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 287a9e1e7..671771bcb 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -401,11 +401,8 @@ void PutObserverInServer (void)
 		WriteEntity(MSG_ONE, self);
 	}
 
-	DropAllRunes(self);
 	MUTATOR_CALLHOOK(MakePlayerObserver);
 
-	minstagib_stop_countdown(self);
-
 	Portal_ClearAll(self);
 	
 	if(self.alivetime)
@@ -474,7 +471,6 @@ void PutObserverInServer (void)
 	self.think = func_null;
 	self.nextthink = 0;
 	self.hook_time = 0;
-	self.runes = 0;
 	self.deadflag = DEAD_NO;
 	self.angles = spot.angles;
 	self.angles_z = 0;
@@ -723,10 +719,7 @@ void PutClientInServer (void)
 		if(autocvar__notarget)
 			self.flags |= FL_NOTARGET;
 		self.takedamage = DAMAGE_AIM;
-		if(g_minstagib)
-			self.effects = EF_FULLBRIGHT;
-		else
-			self.effects = 0;
+		self.effects = 0;
 		self.effects |= EF_TELEPORT_BIT | EF_RESTARTANIM_BIT;
 		self.air_finished = time + 12;
 		self.dmg = 2;
@@ -807,8 +800,6 @@ void PutClientInServer (void)
 
 		self.metertime = 0;
 
-		self.runes = 0;
-
 		self.deadflag = DEAD_NO;
 
 		self.angles = spot.angles;
@@ -1400,30 +1391,30 @@ void ClientConnect (void)
 		{
 			switch(autocvar_g_campaign_forceteam)
 			{
-				case 1: self.team_forced = FL_TEAM_1; break;
-				case 2: self.team_forced = FL_TEAM_2; break;
-				case 3: self.team_forced = FL_TEAM_3; break;
-				case 4: self.team_forced = FL_TEAM_4; break;
+				case 1: self.team_forced = NUM_TEAM_1; break;
+				case 2: self.team_forced = NUM_TEAM_2; break;
+				case 3: self.team_forced = NUM_TEAM_3; break;
+				case 4: self.team_forced = NUM_TEAM_4; break;
 				default: self.team_forced = 0;
 			}
 		}
 	}
 	else if(PlayerInIDList(self, autocvar_g_forced_team_red))
-		self.team_forced = FL_TEAM_1;
+		self.team_forced = NUM_TEAM_1;
 	else if(PlayerInIDList(self, autocvar_g_forced_team_blue))
-		self.team_forced = FL_TEAM_2;
+		self.team_forced = NUM_TEAM_2;
 	else if(PlayerInIDList(self, autocvar_g_forced_team_yellow))
-		self.team_forced = FL_TEAM_3;
+		self.team_forced = NUM_TEAM_3;
 	else if(PlayerInIDList(self, autocvar_g_forced_team_pink))
-		self.team_forced = FL_TEAM_4;
+		self.team_forced = NUM_TEAM_4;
 	else if(autocvar_g_forced_team_otherwise == "red")
-		self.team_forced = FL_TEAM_1;
+		self.team_forced = NUM_TEAM_1;
 	else if(autocvar_g_forced_team_otherwise == "blue")
-		self.team_forced = FL_TEAM_2;
+		self.team_forced = NUM_TEAM_2;
 	else if(autocvar_g_forced_team_otherwise == "yellow")
-		self.team_forced = FL_TEAM_3;
+		self.team_forced = NUM_TEAM_3;
 	else if(autocvar_g_forced_team_otherwise == "pink")
-		self.team_forced = FL_TEAM_4;
+		self.team_forced = NUM_TEAM_4;
 	else if(autocvar_g_forced_team_otherwise == "spectate")
 		self.team_forced = -1;
 	else if(autocvar_g_forced_team_otherwise == "spectator")
@@ -1637,7 +1628,6 @@ void ClientDisconnect (void)
 		
 	Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_QUIT_DISCONNECT, self.netname);
 
-	DropAllRunes(self);
 	MUTATOR_CALLHOOK(ClientDisconnect);
 
 	Portal_ClearAll(self);
@@ -1794,55 +1784,7 @@ void player_powerups (void)
 	Fire_ApplyDamage(self);
 	Fire_ApplyEffect(self);
 
-	if (g_minstagib)
-	{
-		self.effects |= EF_FULLBRIGHT;
-
-		if (self.items & IT_STRENGTH)
-		{
-			play_countdown(self.strength_finished, "misc/poweroff.wav");
-			if (time > self.strength_finished)
-			{
-				self.alpha = default_player_alpha;
-				self.exteriorweaponentity.alpha = default_weapon_alpha;
-				self.items &~= IT_STRENGTH;
-				//Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERDOWN_INVISIBILITY, self.netname);
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERDOWN_INVISIBILITY);
-			}
-		}
-		else
-		{
-			if (time < self.strength_finished)
-			{
-				self.alpha = g_minstagib_invis_alpha;
-				self.exteriorweaponentity.alpha = g_minstagib_invis_alpha;
-				self.items |= IT_STRENGTH;
-				Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_INVISIBILITY, self.netname);
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERUP_INVISIBILITY);
-			}
-		}
-
-		if (self.items & IT_INVINCIBLE)
-		{
-			play_countdown(self.invincible_finished, "misc/poweroff.wav");
-			if (time > self.invincible_finished)
-			{
-				self.items = self.items - (self.items & IT_INVINCIBLE);
-				//Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERDOWN_SPEED, self.netname);
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERDOWN_SPEED);
-			}
-		}
-		else
-		{
-			if (time < self.invincible_finished)
-			{
-				self.items = self.items | IT_INVINCIBLE;
-				Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_SPEED, self.netname);
-				Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERUP_SPEED);
-			}
-		}
-	}
-	else // if we're not in minstagib, continue. I added this else to replace the "return" which was here that broke the callhook for this function -- This code is nasty.
+	if not(g_minstagib)
 	{
 		if (self.items & IT_STRENGTH)
 		{
@@ -2011,32 +1953,6 @@ void player_regen (void)
 
 	max_mod = regen_mod = rot_mod = limit_mod = 1;
 
-	if (self.runes & RUNE_REGEN)
-	{
-		if (self.runes & CURSE_VENOM) // do we have both rune/curse?
-		{
-			regen_mod = autocvar_g_balance_rune_regen_combo_regenrate;
-			max_mod = autocvar_g_balance_rune_regen_combo_hpmod;
-			limit_mod = autocvar_g_balance_rune_regen_combo_limitmod;
-		}
-		else
-		{
-			regen_mod = autocvar_g_balance_rune_regen_regenrate;
-			max_mod = autocvar_g_balance_rune_regen_hpmod;
-			limit_mod = autocvar_g_balance_rune_regen_limitmod;
-		}
-	}
-	else if (self.runes & CURSE_VENOM)
-	{
-		max_mod = autocvar_g_balance_curse_venom_hpmod;
-		if (self.runes & RUNE_REGEN) // do we have both rune/curse?
-			rot_mod = autocvar_g_balance_rune_regen_combo_rotrate;
-		else
-			rot_mod = autocvar_g_balance_curse_venom_rotrate;
-		limit_mod = autocvar_g_balance_curse_venom_limitmod;
-		//if (!self.runes & RUNE_REGEN)
-		//	rot_mod = autocvar_g_balance_curse_venom_rotrate;
-	}
 	maxh = maxh * max_mod;
 	//maxa = maxa * max_mod;
 	//maxf = maxf * max_mod;
@@ -2321,50 +2237,34 @@ void ShowRespawnCountdown()
 	}
 }
 
-.float prevent_join_msgtime;
 void LeaveSpectatorMode()
 {
-	if(nJoinAllowed(self)) {
-		if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || (self.wasplayer && autocvar_g_changeteam_banned) || self.team_forced > 0) {
+	if(nJoinAllowed(self))
+	{
+		if(!teamplay || autocvar_g_campaign || autocvar_g_balance_teams || (self.wasplayer && autocvar_g_changeteam_banned) || self.team_forced > 0)
+		{
 			self.classname = "player";
 
 			if(autocvar_g_campaign || autocvar_g_balance_teams)
-				JoinBestTeam(self, FALSE, TRUE);
+				{ JoinBestTeam(self, FALSE, TRUE); }
 
 			if(autocvar_g_campaign)
-				campaign_bots_may_start = 1;
+				{ campaign_bots_may_start = 1; }
+			else
+				{ Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD); }
 
+			Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
+			
 			PutClientInServer();
 
-			if(self.classname == STR_PLAYER)
-				Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname);
-
-			//if(!autocvar_g_campaign)
-			//if (time < self.jointime + autocvar_welcome_message_time)
-			//	Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD);
-
-			if (self.prevent_join_msgtime)
-			{
-				Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT);
-				self.prevent_join_msgtime = 0;
-			}
-
-			return;
-		} else {
-			if (g_ca && self.caplayer) {
-			}	// do nothing
-			else
-				stuffcmd(self,"menu_showteamselect\n");
-			return;
+			if(IS_PLAYER(self)) { Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_JOIN_PLAY, self.netname); }
 		}
+		else if not(g_ca && self.caplayer) { stuffcmd(self, "menu_showteamselect\n"); }
 	}
-	else {
-		//player may not join because of g_maxplayers is set
-		if (time - self.prevent_join_msgtime > 2)
-		{
-			Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_JOIN_PREVENT);
-			self.prevent_join_msgtime = time;
-		}
+	else
+	{
+		// Player may not join because g_maxplayers is set
+		Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_PREVENT_JOIN);
 	}
 }
 
@@ -2442,7 +2342,7 @@ void PrintWelcomeMessage()
 				self.motd_actived_time = time;
 			else if ((time - self.motd_actived_time > 2) && self.classname == "player") { // hide it some seconds after BUTTON_INFO has been released
 				self.motd_actived_time = 0;
-				Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD);
+				Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD);
 			}
 		} else {
 			if ((time - self.jointime) > autocvar_welcome_message_time) {
@@ -2450,7 +2350,7 @@ void PrintWelcomeMessage()
 					self.motd_actived_time = time;
 				else if (time - self.motd_actived_time > 2) { // hide it some seconds after BUTTON_INFO has been released
 					self.motd_actived_time = 0;
-					Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_MOTD);
+					Kill_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER_CPID, CPID_MOTD);
 				}
 			}
 		}
@@ -2689,9 +2589,6 @@ void PlayerPreThink (void)
 			player_powerups();
 		}
 
-		if (g_minstagib)
-			minstagib_ammocheck();
-
 		if (self.deadflag != DEAD_NO)
 		{
 			float button_pressed, force_respawn;