Merge remote branch 'origin/mirceakitsune/per_character_sounds'

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

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 7713125235be848a8e5d46a8e276212a6d5ecd7d..603aad7fd0977eb30b0f84f651db59d1677a1358 100644 (file)
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -191,6 +191,7 @@ void StartFrame (void)
        sv_airstrafeaccelerate = cvar("sv_airstrafeaccelerate");
        sv_maxairstrafespeed = cvar("sv_maxairstrafespeed");
        sv_aircontrol = cvar("sv_aircontrol");
+       sv_aircontrol_power = cvar("sv_aircontrol_power");
        sv_warsowbunny_airforwardaccel = cvar("sv_warsowbunny_airforwardaccel");
        sv_warsowbunny_accel = cvar("sv_warsowbunny_accel");
        sv_warsowbunny_topspeed = cvar("sv_warsowbunny_topspeed");
@@ -395,4 +396,10 @@ void SV_OnEntityPreSpawnFunction()
                self.angles_z = self.angles_z + (random() * 2 - 1) * self.anglesjitter_z;
        if(self.anglejitter != 0)
                self.angles_y = self.angles_y + (random() * 2 - 1) * self.anglejitter;
+
+       if(MUTATOR_CALLHOOK(OnEntityPreSpawn))
+       {
+               remove(self);
+               return;
+       }
 }