X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fteamplay.qc;h=b50c49eb5a0eb21ea00220485eb5b9f8060f90e8;hb=d8825c487a0be97a0f132bb878bf3c1a13736b00;hp=7bd44fec82401c29a41533a9b50f85b224406db1;hpb=5f9a104fb3f5ef5f8a68d671425290ea8a6f9843;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 7bd44fec8..b50c49eb5 100644
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -41,6 +41,7 @@ void ActivateTeamplay()
 {
 	serverflags |= SERVERFLAG_TEAMPLAY;
 	teamplay = 1;
+	cvar_set("teamplay", "2");  // DP needs this for sending proper getstatus replies.
 }
 
 void InitGameplayMode()
@@ -57,8 +58,9 @@ void InitGameplayMode()
 	world.maxs = mi_max;
 
 	MapInfo_LoadMapSettings(mapname);
-	teamplay = 0;
 	serverflags &= ~SERVERFLAG_TEAMPLAY;
+	teamplay = 0;
+	cvar_set("teamplay", "0");  // DP needs this for sending proper getstatus replies.
 
 	if (!cvar_value_issafe(world.fog))
 	{
@@ -161,6 +163,7 @@ void InitGameplayMode()
 	if(g_onslaught)
 	{
 		ActivateTeamplay();
+		fraglimit_override = autocvar_g_onslaught_point_limit;
 		have_team_spawns = -1; // request team spawns
 		MUTATOR_ADD(gamemode_onslaught);
 	}
@@ -281,8 +284,7 @@ string getwelcomemessage(void)
 {
 	string s, modifications, motd;
 
-	ret_string = "";
-	MUTATOR_CALLHOOK(BuildMutatorsPrettyString);
+	MUTATOR_CALLHOOK(BuildMutatorsPrettyString, "");
 	modifications = ret_string;
 
 	if(g_weaponarena)
@@ -430,8 +432,7 @@ void CheckAllowedTeams (entity for_whom)
 		// cover anything else by treating it like tdm with no teams spawned
 		dm = 2;
 
-		ret_float = dm;
-		MUTATOR_CALLHOOK(GetTeamCount);
+		MUTATOR_CALLHOOK(GetTeamCount, dm);
 		dm = ret_float;
 
 		if(dm >= 4)