Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / gamemode_assault.qc

diff --git a/qcsrc/server/mutators/gamemode_assault.qc b/qcsrc/server/mutators/gamemode_assault.qc
index 0325067f28fb396d795c693ba8608524ba473dc1..63f065298706a4ee097667f017d24dd73a81cd21 100644 (file)
--- 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;
     }
@@ -588,7 +588,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
        {