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=60df95a006eab4ce0941dc2176d43216e0cda9a7;hp=18fb2bb236cb0d2a96dca9a5040964072f2581bd;hb=0f0e69c6625fc4db17559e2e47f2fdaed8298076;hpb=28db67726bdcc01ded4d4c942326dfc7f7375e18

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 18fb2bb236..60df95a006 100644
--- a/qcsrc/server/mutators/gamemode_assault.qc
+++ b/qcsrc/server/mutators/gamemode_assault.qc
@@ -243,24 +243,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();
@@ -270,7 +270,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";
 
@@ -288,11 +288,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
@@ -303,8 +303,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);
@@ -316,7 +316,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";
@@ -327,8 +327,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;
@@ -350,7 +350,7 @@ void havocbot_goalrating_ast_targets(float ratingscale)
 		if (ad.target == "")
 			continue;
 
-		if not(ad.bot_attack)
+		if (!ad.bot_attack)
 			continue;
 
 		found = FALSE;
@@ -526,13 +526,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;
@@ -566,7 +566,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