X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_assault.qc;h=d14d9da8c7c5fe2bd42854510b8c1fb8c00a3f86;hb=6f37a8f8076a572097afb13de2c367a72717c927;hp=0325067f28fb396d795c693ba8608524ba473dc1;hpb=3b2bc1bdee04f4c454279bf14ac8ed6b37c6ddb5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 0325067f2..d14d9da8c 100644
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -1,3 +1,10 @@
+#include "gamemode_assault.qh"
+#include "../_.qh"
+
+#include "gamemode.qh"
+
+.entity sprite;
+
 // random functions
 void assault_objective_use()
 {
@@ -63,20 +70,13 @@ void assault_objective_decrease_use()
 			PlayerTeamScore_Add(activator, SP_ASSAULT_OBJECTIVES, ST_ASSAULT_OBJECTIVES, 1);
 			self.enemy.health = -1;
 
-			entity oldself, oldactivator;
+			entity oldself, oldactivator, head;
 
 			oldself = self;
 			self = oldself.enemy;
 			if(self.message)
-			{
-				entity player;
-				string s;
-				FOR_EACH_PLAYER(player)
-				{
-					s = strcat(self.message, "\n");
-					centerprint(player, s);
-				}
-			}
+			FOR_EACH_PLAYER(head)
+				centerprint(head, self.message);
 
 			oldactivator = activator;
 			activator = oldself;
@@ -113,9 +113,9 @@ float assault_decreaser_sprite_visible(entity e)
 	decreaser = self.assault_decreaser;
 
 	if(decreaser.enemy.health >= ASSAULT_VALUE_INACTIVE)
-		return FALSE;
+		return false;
 
-	return TRUE;
+	return true;
 }
 
 void target_objective_decrease_activate()
@@ -212,31 +212,8 @@ void assault_wall_think()
 
 // trigger new round
 // reset objectives, toggle spawnpoints, reset triggers, ...
-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;
 
@@ -376,7 +353,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 		if (!ad.bot_attack)
 			continue;
 
-		found = FALSE;
+		found = false;
 		for(tod = world; (tod = find(tod, targetname, ad.target)); )
 		{
 			if(tod.classname == "target_objective_decrease")
@@ -384,7 +361,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 				if(tod.enemy.health > 0 && tod.enemy.health < ASSAULT_VALUE_INACTIVE)
 				{
 				//	dprint(etos(ad),"\n");
-					found = TRUE;
+					found = true;
 					break;
 				}
 			}
@@ -404,7 +381,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 	//	te_lightning2(world, '0 0 0', p);
 
 		// Find and rate waypoints around it
-		found = FALSE;
+		found = false;
 		best = world;
 		bestvalue = 99999999999;
 		for(radius=0; radius<1500 && !found; radius+=500)
@@ -415,7 +392,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 				if(wp.classname=="waypoint")
 				if(checkpvs(wp.origin, ad))
 				{
-					found = TRUE;
+					found = true;
 					if(wp.cnt<bestvalue)
 					{
 						best = wp;
@@ -546,11 +523,11 @@ void havocbot_ast_reset_role(entity bot)
 MUTATOR_HOOKFUNCTION(assault_PlayerSpawn)
 {
 	if(self.team == assault_attacker_team)
-		centerprint(self, "You are attacking!");
+		Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_ASSAULT_ATTACKING);
 	else
-		centerprint(self, "You are defending!");
+		Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_ASSAULT_DEFENDING);
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(assault_TurretSpawn)
@@ -558,26 +535,26 @@ MUTATOR_HOOKFUNCTION(assault_TurretSpawn)
 	if (!self.team)
 		self.team = 14;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(assault_VehicleSpawn)
 {
 	self.nextthink = time + 0.5;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(assault_BotRoles)
 {
 	havocbot_ast_reset_role(self);
-	return TRUE;
+	return true;
 }
 
 // scoreboard setup
 void assault_ScoreRules()
 {
-	ScoreRules_basics(2, SFL_SORT_PRIO_SECONDARY, SFL_SORT_PRIO_SECONDARY, TRUE);
+	ScoreRules_basics(2, SFL_SORT_PRIO_SECONDARY, SFL_SORT_PRIO_SECONDARY, true);
 	ScoreInfo_SetLabel_TeamScore(  ST_ASSAULT_OBJECTIVES,    "objectives",      SFL_SORT_PRIO_PRIMARY);
 	ScoreInfo_SetLabel_PlayerScore(SP_ASSAULT_OBJECTIVES,    "objectives",      SFL_SORT_PRIO_PRIMARY);
 	ScoreRules_basics_end();
@@ -588,7 +565,7 @@ MUTATOR_DEFINITION(gamemode_assault)
 	MUTATOR_HOOK(PlayerSpawn, assault_PlayerSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(TurretSpawn, assault_TurretSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(VehicleSpawn, assault_VehicleSpawn, CBC_ORDER_ANY);
-	MUTATOR_HOOK(HavocBot_ChooseRule, assault_BotRoles, CBC_ORDER_ANY);
+	MUTATOR_HOOK(HavocBot_ChooseRole, assault_BotRoles, CBC_ORDER_ANY);
 
 	MUTATOR_ONADD
 	{