X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=5a9d2ee3b999f5989482d0375fad17c4c8ca8502;hp=6defa736f63cdd09327cedb34e35033ff427d714;hb=437d67dbc7631d6c49e922990d96461d3ff4b7b2;hpb=7bd8f8562a392fda3ac881b1fbe2a35a5ef0f5c8

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 6defa736f..5a9d2ee3b 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -1,5 +1,4 @@
 #include "teamplay.qh"
-#include "_all.qh"
 
 #include "cl_client.qh"
 #include "race.qh"
@@ -12,7 +11,8 @@
 
 #include "mutators/mutators_include.qh"
 
-#include "../common/deathtypes.qh"
+#include "../common/deathtypes/all.qh"
+#include "../common/gamemodes/all.qh"
 #include "../common/teams.qh"
 
 void TeamchangeFrags(entity e)
@@ -247,9 +247,6 @@ void InitGameplayMode()
 		MUTATOR_ADD(gamemode_invasion);
 	}
 
-	if(teamplay)
-		entcs_init();
-
 	cache_mutatormsg = strzone("");
 	cache_lastmutatormsg = strzone("");
 
@@ -775,7 +772,7 @@ float JoinBestTeam(entity pl, float only_return_best, float forcebestteam)
 		LogTeamchange(pl.playerid, pl.team, 2); // log auto join
 
 		if(pl.deadflag == DEAD_NO)
-			Damage(pl, pl, pl, 100000, DEATH_TEAMCHANGE, pl.origin, '0 0 0');
+			Damage(pl, pl, pl, 100000, DEATH_TEAMCHANGE.m_id, pl.origin, '0 0 0');
 	}
 
 	return smallest;
@@ -861,7 +858,7 @@ void SV_ChangeTeam(float _color)
 	{
 		// kill player when changing teams
 		if(self.deadflag == DEAD_NO)
-			Damage(self, self, self, 100000, DEATH_TEAMCHANGE, self.origin, '0 0 0');
+			Damage(self, self, self, 100000, DEATH_TEAMCHANGE.m_id, self.origin, '0 0 0');
 	}
 }
 
@@ -1002,6 +999,6 @@ void ShufflePlayerOutOfTeam (float source_team)
 	SetPlayerTeam(selected, smallestteam, source_team, false);
 
 	if(selected.deadflag == DEAD_NO)
-		Damage(selected, selected, selected, 100000, DEATH_AUTOTEAMCHANGE, selected.origin, '0 0 0');
+		Damage(selected, selected, selected, 100000, DEATH_AUTOTEAMCHANGE.m_id, selected.origin, '0 0 0');
 	Send_Notification(NOTIF_ONE, selected, MSG_CENTER, CENTER_DEATH_SELF_AUTOTEAMCHANGE, selected.team);
 }