X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_domination.qc;h=7b392a0663af09b0b65be533388aee3cb211b083;hp=dd6e8b2109be3b97ceab791a5874a8ec94edf880;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=244e5081c5c503c307e557c98ac864f6c9731475

diff --git a/qcsrc/server/mutators/gamemode_domination.qc b/qcsrc/server/mutators/gamemode_domination.qc
index dd6e8b2109..7b392a0663 100644
--- a/qcsrc/server/mutators/gamemode_domination.qc
+++ b/qcsrc/server/mutators/gamemode_domination.qc
@@ -1,3 +1,8 @@
+#include "gamemode_domination.qh"
+#include "../_all.qh"
+
+#include "gamemode.qh"
+
 void dom_EventLog(string mode, float team_before, entity actor) // use an alias for easy changing and quick editing later
 {
 	if(autocvar_sv_eventlog)
@@ -19,7 +24,6 @@ void dompoint_captured ()
 {
 	entity head;
 	float old_delay, old_team, real_team;
-	string msg = "dom-neut";
 
 	// now that the delay has expired, switch to the latest team to lay claim to this point
 	head = self.owner;
@@ -75,15 +79,16 @@ void dompoint_captured ()
 	self.delay = old_delay;
 	self.team = old_team;
 
+	entity msg = WP_DomNeut;
 	switch(self.team)
 	{
-		case NUM_TEAM_1: msg = "dom-red"; break;
-		case NUM_TEAM_2: msg = "dom-blue"; break;
-		case NUM_TEAM_3: msg = "dom-yellow"; break;
-		case NUM_TEAM_4: msg = "dom-pink"; break;
+		case NUM_TEAM_1: msg = WP_DomRed; break;
+		case NUM_TEAM_2: msg = WP_DomBlue; break;
+		case NUM_TEAM_3: msg = WP_DomYellow; break;
+		case NUM_TEAM_4: msg = WP_DomPink; break;
 	}
 
-	WaypointSprite_UpdateSprites(self.sprite, msg, "", "");
+	WaypointSprite_UpdateSprites(self.sprite, msg, WP_Null, WP_Null);
 
 	total_pps = 0, pps_red = 0, pps_blue = 0, pps_yellow = 0, pps_pink = 0;
 	for(head = world; (head = find(head, classname, "dom_controlpoint")) != world; )
@@ -221,7 +226,7 @@ void dompointtouch()
 	if(head == world)
 		return;
 
-	WaypointSprite_UpdateSprites(self.sprite, "dom-neut", "", "");
+	WaypointSprite_UpdateSprites(self.sprite, WP_DomNeut, WP_Null, WP_Null);
 	WaypointSprite_UpdateTeamRadar(self.sprite, RADARICON_DOMPOINT, '0 1 1');
 	WaypointSprite_Ping(self.sprite);
 
@@ -287,7 +292,7 @@ void dom_controlpoint_setup()
 	droptofloor();
 
 	waypoint_spawnforitem(self);
-	WaypointSprite_SpawnFixed("dom-neut", self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT, '0 1 1');
+	WaypointSprite_SpawnFixed(WP_DomNeut, self.origin + '0 0 32', self, sprite, RADARICON_DOMPOINT);
 }
 
 float total_controlpoints, redowned, blueowned, yellowowned, pinkowned;
@@ -592,7 +597,7 @@ void dom_DelayedInit() // Do this check with a delay so we can wait for teams to
 	// if no teams are found, spawn defaults
 	if(find(world, classname, "dom_team") == world || autocvar_g_domination_teams_override >= 2)
 	{
-		print("No ""dom_team"" entities found on this map, creating them anyway.\n");
+		LOG_INFO("No ""dom_team"" entities found on this map, creating them anyway.\n");
 		domination_teams = bound(2, ((autocvar_g_domination_teams_override < 2) ? autocvar_g_domination_default_teams : autocvar_g_domination_teams_override), 4);
 		dom_spawnteams(domination_teams);
 	}
@@ -647,7 +652,7 @@ MUTATOR_DEFINITION(gamemode_domination)
 
 	MUTATOR_ONREMOVE
 	{
-		print("This is a game type and it cannot be removed at runtime.");
+		LOG_INFO("This is a game type and it cannot be removed at runtime.");
 		return -1;
 	}