X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fassault.qc;h=517da81684928019729e385b6feb244b32963021;hb=b8e3716086cc9249b2f93f86f082e1acbc922383;hp=05b2cc750232e5fbc65a5136decf6d524c864fee;hpb=9df92eba777ae4365b46b0eb61fe315d91ed9388;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 05b2cc750..517da8168 100644
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -30,9 +30,6 @@ void assault_objective_reset() {
 }
 
 void assault_objective_use() {
-	if(other.classname == "info_player_deathmatch") // a spawn, a spawn
-		return;
-
 	// activate objective
 	self.health = 100;
 	//print("^2Activated objective ", self.targetname, "=", etos(self), "\n");
@@ -106,7 +103,7 @@ void assault_objective_decrease_use() {
 						centerprint(player, s);
 					}
 				}
-					
+
 				oldactivator = activator;
 				activator = oldself;
 					SUB_UseTargets();
@@ -158,7 +155,7 @@ void target_objective_decrease_activate()
 				ent.sprite = world;
 		}
 
-		spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite);
+		spr = WaypointSprite_SpawnFixed("<placeholder>", 0.5 * (ent.absmin + ent.absmax), ent, assault_sprite, RADARICON_OBJECTIVE, '1 0.5 0');
 		spr.assault_decreaser = self;
 		spr.waypointsprite_visible_for_player = assault_decreaser_sprite_visible;
 		spr.classname = "sprite_waypoint";
@@ -172,7 +169,6 @@ void target_objective_decrease_activate()
 		}
 		else
 			WaypointSprite_UpdateSprites(spr, "as-defend", "as-push", "as-push");
-		WaypointSprite_UpdateTeamRadar(spr, RADARICON_OBJECTIVE, '1 0.5 0');
 	}
 }
 
@@ -211,6 +207,7 @@ void spawnfunc_func_assault_destructible() {
 		return;
 	}
 	self.spawnflags = 3;
+	self.classname = "func_assault_destructible";
 	if(assault_attacker_team == COLOR_TEAM1) {
 		self.team = COLOR_TEAM2;
 	} else {
@@ -275,7 +272,7 @@ void assault_roundstart_use() {
 	activator = self;
 	SUB_UseTargets();
 
-	
+
 #ifdef TTURRETS_ENABLED
 	entity ent, oldself;
 
@@ -317,9 +314,31 @@ void spawnfunc_target_assault_roundstart() {
 
 // trigger new round
 // reset objectives, toggle spawnpoints, reset triggers, ...
-void assault_new_round() {
+void vehicles_clearrturn();
+void vehicles_spawn();
+void assault_new_round()
+{
+    entity oldself;
 	//bprint("ASSAULT: new round\n");
 
+	oldself = self;
+	// Eject players from vehicles
+    FOR_EACH_PLAYER(self)
+    {
+        if(self.vehicle)
+            vehicles_exit(VHEF_RELESE);
+    }
+
+    self = findchainflags(vehicle_flags, VHF_ISVEHICLE);
+    while(self)
+    {
+        vehicles_clearrturn();
+        vehicles_spawn();
+        self = self.chain;
+    }
+
+    self = oldself;
+
 	// up round counter
 	self.winning = self.winning + 1;