X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_assault.qc;h=7e13b334d38d5e56a9547d89ddaaaa86e766e966;hp=40f3528496b013fefc438dc28d705c2826306bc3;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=153e558088db2813f7f7dd5367244b5470f4d425

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 40f3528496..7e13b334d3 100644
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -131,20 +131,20 @@ void target_objective_decrease_activate()
 				ent.sprite = world;
 		}
 
-		spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite, RADARICON_OBJECTIVE, '1 0.5 0');
+		spr = WaypointSprite_SpawnFixed(WP_Assault, 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite, RADARICON_OBJECTIVE);
 		spr.assault_decreaser = self;
 		spr.waypointsprite_visible_for_player = assault_decreaser_sprite_visible;
 		spr.classname = "sprite_waypoint";
 		WaypointSprite_UpdateRule(spr, assault_attacker_team, SPRITERULE_TEAMPLAY);
 		if(ent.classname == "func_assault_destructible")
 		{
-			WaypointSprite_UpdateSprites(spr, "as-defend", "as-destroy", "as-destroy");
+			WaypointSprite_UpdateSprites(spr, WP_AssaultDefend, WP_AssaultDestroy, WP_AssaultDestroy);
 			WaypointSprite_UpdateMaxHealth(spr, ent.max_health);
 			WaypointSprite_UpdateHealth(spr, ent.health);
 			ent.sprite = spr;
 		}
 		else
-			WaypointSprite_UpdateSprites(spr, "as-defend", "as-push", "as-push");
+			WaypointSprite_UpdateSprites(spr, WP_AssaultDefend, WP_AssaultPush, WP_AssaultPush);
 	}
 }
 
@@ -170,7 +170,6 @@ void assault_roundstart_use()
 	activator = self;
 	SUB_UseTargets();
 
-#ifdef TTURRETS_ENABLED
 	entity ent, oldself;
 
 	//(Re)spawn all turrets
@@ -186,12 +185,11 @@ void assault_roundstart_use()
 		self = ent;
 
 		// Dubbles as teamchange
-		turret_stdproc_respawn();
+		turret_respawn();
 
 		ent = find(ent, classname, "turret_main");
 	}
 	self = oldself;
-#endif
 }
 
 void assault_wall_think()
@@ -555,8 +553,8 @@ MUTATOR_HOOKFUNCTION(assault_PlayerSpawn)
 
 MUTATOR_HOOKFUNCTION(assault_TurretSpawn)
 {
-	if (!self.team)
-		self.team = 14;
+	if(!self.team || self.team == MAX_SHOT_DISTANCE)
+		self.team = 5; // this gets reversed when match starts?
 
 	return false;
 }
@@ -574,6 +572,11 @@ MUTATOR_HOOKFUNCTION(assault_BotRoles)
 	return true;
 }
 
+MUTATOR_HOOKFUNCTION(assault_PlayHitsound)
+{
+	return (frag_victim.classname == "func_assault_destructible");
+}
+
 // scoreboard setup
 void assault_ScoreRules()
 {
@@ -589,6 +592,7 @@ MUTATOR_DEFINITION(gamemode_assault)
 	MUTATOR_HOOK(TurretSpawn, assault_TurretSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(VehicleSpawn, assault_VehicleSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(HavocBot_ChooseRole, assault_BotRoles, CBC_ORDER_ANY);
+	MUTATOR_HOOK(PlayHitsound, assault_PlayHitsound, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{
@@ -606,7 +610,7 @@ MUTATOR_DEFINITION(gamemode_assault)
 
 	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;
 	}