X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_assault.qc;h=7b6135de60c7ffecbb1d808187f804bd3cc5738e;hb=198765425d8c346faa41b601cba98247ca2ddac2;hp=94e104728f3ab27271f920c49edfe2d474e2c13e;hpb=f5689f55e2665c871cfabcee9f8534c482e2b79b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 94e104728..7b6135de6 100644
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -212,7 +212,7 @@ void assault_wall_think()
 
 // trigger new round
 // reset objectives, toggle spawnpoints, reset triggers, ...
-void vehicles_clearrturn();
+void vehicles_clearreturn(entity veh);
 void vehicles_spawn();
 void assault_new_round()
 {
@@ -224,13 +224,13 @@ void assault_new_round()
     FOR_EACH_PLAYER(self)
     {
         if(self.vehicle)
-            vehicles_exit(VHEF_RELESE);
+            vehicles_exit(VHEF_RELEASE);
     }
 
     self = findchainflags(vehicle_flags, VHF_ISVEHICLE);
     while(self)
     {
-        vehicles_clearrturn();
+        vehicles_clearreturn(self);
         vehicles_spawn();
         self = self.chain;
     }
@@ -266,24 +266,24 @@ void assault_new_round()
 // spawnfuncs
 void spawnfunc_info_player_attacker()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	self.team = NUM_TEAM_1; // red, gets swapped every round
 	spawnfunc_info_player_deathmatch();
 }
 
 void spawnfunc_info_player_defender()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	self.team = NUM_TEAM_2; // blue, gets swapped every round
 	spawnfunc_info_player_deathmatch();
 }
 
 void spawnfunc_target_objective()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	self.classname = "target_objective";
 	self.use = assault_objective_use;
 	assault_objective_reset();
@@ -293,7 +293,7 @@ void spawnfunc_target_objective()
 
 void spawnfunc_target_objective_decrease()
 {
-	if not(g_assault) { remove(self); return; }
+	if (!g_assault) { remove(self); return; }
 
 	self.classname = "target_objective_decrease";
 
@@ -311,11 +311,11 @@ void spawnfunc_target_objective_decrease()
 // destructible walls that can be used to trigger target_objective_decrease
 void spawnfunc_func_assault_destructible()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	self.spawnflags = 3;
 	self.classname = "func_assault_destructible";
-	
+
 	if(assault_attacker_team == NUM_TEAM_1)
 		self.team = NUM_TEAM_2;
 	else
@@ -326,8 +326,8 @@ void spawnfunc_func_assault_destructible()
 
 void spawnfunc_func_assault_wall()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	self.classname = "func_assault_wall";
 	self.mdl = self.model;
 	setmodel(self, self.mdl);
@@ -339,7 +339,7 @@ void spawnfunc_func_assault_wall()
 
 void spawnfunc_target_assault_roundend()
 {
-	if not(g_assault) { remove(self); return; }
+	if (!g_assault) { remove(self); return; }
 
 	self.winning = 0; // round not yet won by attackers
 	self.classname = "target_assault_roundend";
@@ -350,8 +350,8 @@ void spawnfunc_target_assault_roundend()
 
 void spawnfunc_target_assault_roundstart()
 {
-	if not(g_assault) { remove(self); return; }
-	
+	if (!g_assault) { remove(self); return; }
+
 	assault_attacker_team = NUM_TEAM_1;
 	self.classname = "target_assault_roundstart";
 	self.use = assault_roundstart_use;
@@ -373,7 +373,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 		if (ad.target == "")
 			continue;
 
-		if not(ad.bot_attack)
+		if (!ad.bot_attack)
 			continue;
 
 		found = FALSE;
@@ -549,13 +549,13 @@ MUTATOR_HOOKFUNCTION(assault_PlayerSpawn)
 		centerprint(self, "You are attacking!");
 	else
 		centerprint(self, "You are defending!");
-		
+
 	return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(assault_TurretSpawn)
 {
-	if not (self.team)
+	if (!self.team)
 		self.team = 14;
 
 	return FALSE;
@@ -589,7 +589,7 @@ MUTATOR_DEFINITION(gamemode_assault)
 	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_ONADD
 	{
 		if(time > 1) // game loads at time 1