Merge branch 'master' into terencehill/tooltips_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / sv_turrets.qc

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index 92971878370ae1b205fd8c6a27ba61c1ab2a46d1..c17061b22f0211422b48619fc1da96849e0ff222 100644 (file)
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -1,4 +1,5 @@
 #ifdef SVQC
+#include "all.qh"
 #include "../../server/autocvars.qh"
 
 // Generic aiming
@@ -457,7 +458,7 @@ entity turret_projectile(string _snd, float _size, float _health, float _death,
 {SELFPARAM();
        entity proj;
 
-       sound (self, CH_WEAPON_A, _snd, VOL_BASE, ATTEN_NORM);
+       _sound (self, CH_WEAPON_A, _snd, VOL_BASE, ATTEN_NORM);
        proj                             = spawn ();
        setorigin(proj, self.tur_shotorg);
        setsize(proj, '-0.5 -0.5 -0.5' * _size, '0.5 0.5 0.5' * _size);
@@ -1327,7 +1328,7 @@ float turret_initialize(float tur_id)
 
        ++turret_count;
 
-       setmodel(self, tur.model);
+       _setmodel(self, tur.model);
        setsize(self, tur.mins, tur.maxs);
 
        self.turretid                           = tur_id;
@@ -1352,7 +1353,7 @@ float turret_initialize(float tur_id)
        self.nextthink                     += turret_count * sys_frametime;
 
        self.tur_head = spawn();
-       setmodel(self.tur_head, tur.head_model);
+       _setmodel(self.tur_head, tur.head_model);
        setsize(self.tur_head, '0 0 0', '0 0 0');
        setorigin(self.tur_head, '0 0 0');
        setattachment(self.tur_head, self, "tag_head");