X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fgamemode_assault.qc;h=60df95a006eab4ce0941dc2176d43216e0cda9a7;hb=b38e2bae0a50554f26bf5af1fbd0e70b97cc0c71;hp=ceeb51dd98f45886e97d2ffcfbd8609d238fae89;hpb=57f409333cc09406298b66421d5e99357a7f586d;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc index ceeb51dd9..60df95a00 100644 --- a/qcsrc/server/mutators/gamemode_assault.qc +++ b/qcsrc/server/mutators/gamemode_assault.qc @@ -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; @@ -267,7 +244,7 @@ void assault_new_round() void spawnfunc_info_player_attacker() { if (!g_assault) { remove(self); return; } - + self.team = NUM_TEAM_1; // red, gets swapped every round spawnfunc_info_player_deathmatch(); } @@ -275,7 +252,7 @@ void spawnfunc_info_player_attacker() void spawnfunc_info_player_defender() { if (!g_assault) { remove(self); return; } - + self.team = NUM_TEAM_2; // blue, gets swapped every round spawnfunc_info_player_deathmatch(); } @@ -283,7 +260,7 @@ void spawnfunc_info_player_defender() void spawnfunc_target_objective() { if (!g_assault) { remove(self); return; } - + self.classname = "target_objective"; self.use = assault_objective_use; assault_objective_reset(); @@ -312,10 +289,10 @@ void spawnfunc_target_objective_decrease() void spawnfunc_func_assault_destructible() { 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 @@ -327,7 +304,7 @@ void spawnfunc_func_assault_destructible() void spawnfunc_func_assault_wall() { if (!g_assault) { remove(self); return; } - + self.classname = "func_assault_wall"; self.mdl = self.model; setmodel(self, self.mdl); @@ -351,7 +328,7 @@ void spawnfunc_target_assault_roundend() void spawnfunc_target_assault_roundstart() { if (!g_assault) { remove(self); return; } - + assault_attacker_team = NUM_TEAM_1; self.classname = "target_assault_roundstart"; self.use = assault_roundstart_use; @@ -549,7 +526,7 @@ MUTATOR_HOOKFUNCTION(assault_PlayerSpawn) centerprint(self, "You are attacking!"); else centerprint(self, "You are defending!"); - + return FALSE; } @@ -589,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