X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_nexball.qc;h=8790162afa9804ed508c48bcecb4241930ad5319;hb=0f060ee04a520b3692340198b22fa6184181c827;hp=74698d371d30c7b918e46d99d6944d0cf4931d4a;hpb=80ea2c26461cab2b2992f79643eaf59aacb7cda7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index 74698d371..8790162af 100644
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -425,28 +425,28 @@ void nb_spawnteams(void)
 	{
 		switch(e.team)
 		{
-		case FL_TEAM_1:
+		case NUM_TEAM_1:
 			if(!t_r)
 			{
 				nb_spawnteam("Red", e.team-1)   ;
 				t_r = 1;
 			}
 			break;
-		case FL_TEAM_2:
+		case NUM_TEAM_2:
 			if(!t_b)
 			{
 				nb_spawnteam("Blue", e.team-1)  ;
 				t_b = 1;
 			}
 			break;
-		case FL_TEAM_3:
+		case NUM_TEAM_3:
 			if(!t_y)
 			{
 				nb_spawnteam("Yellow", e.team-1);
 				t_y = 1;
 			}
 			break;
-		case FL_TEAM_4:
+		case NUM_TEAM_4:
 			if(!t_p)
 			{
 				nb_spawnteam("Pink", e.team-1)  ;
@@ -576,22 +576,22 @@ void SpawnGoal(void)
 
 void spawnfunc_nexball_redgoal(void)
 {
-	self.team = FL_TEAM_1;
+	self.team = NUM_TEAM_1;
 	SpawnGoal();
 }
 void spawnfunc_nexball_bluegoal(void)
 {
-	self.team = FL_TEAM_2;
+	self.team = NUM_TEAM_2;
 	SpawnGoal();
 }
 void spawnfunc_nexball_yellowgoal(void)
 {
-	self.team = FL_TEAM_3;
+	self.team = NUM_TEAM_3;
 	SpawnGoal();
 }
 void spawnfunc_nexball_pinkgoal(void)
 {
-	self.team = FL_TEAM_4;
+	self.team = NUM_TEAM_4;
 	SpawnGoal();
 }
 
@@ -844,14 +844,8 @@ float w_nexball_weapon(float req)
 		precache_sound("misc/typehit.wav");
 	}
 	else if(req == WR_SETUP)
-		weapon_setup(WEP_PORTO);
-	else if(req == WR_SUICIDEMESSAGE)
-	{
-		w_deathtypestring = "is a weirdo";
-	}
-	else if(req == WR_KILLMESSAGE)
 	{
-		w_deathtypestring = "got killed by #'s black magic";
+		weapon_setup(WEP_PORTO);
 	}
 	// No need to check WR_CHECKAMMO* or WR_AIM, it should always return TRUE
 	return TRUE;