X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fcommon%2Fturrets%2Funit%2Fwalker.qc;h=b68c8acf69e94e788505910c5d2cda6d2db9b645;hb=e82756a6d8b8c71f5e6f061c193041eb0943b29c;hp=4a9ca77afe1b4e34e15b408f034ab928e6b8ca7d;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/unit/walker.qc b/qcsrc/common/turrets/unit/walker.qc
index 4a9ca77af..b68c8acf6 100644
--- a/qcsrc/common/turrets/unit/walker.qc
+++ b/qcsrc/common/turrets/unit/walker.qc
@@ -53,7 +53,7 @@ float autocvar_g_turrets_unit_walker_turn_run;
 #define WALKER_PATH(s,e) pathlib_astar(s,e)
 
 float walker_firecheck()
-{
+{SELFPARAM();
     if (self.animflag == ANIM_MELEE)
         return 0;
 
@@ -61,7 +61,7 @@ float walker_firecheck()
 }
 
 void walker_melee_do_dmg()
-{
+{SELFPARAM();
     vector where;
     entity e;
 
@@ -80,18 +80,18 @@ void walker_melee_do_dmg()
 }
 
 void walker_setnoanim()
-{
+{SELFPARAM();
     turrets_setframe(ANIM_NO, false);
     self.animflag = self.frame;
 }
 void walker_rocket_explode()
-{
+{SELFPARAM();
     RadiusDamage (self, self.owner, (autocvar_g_turrets_unit_walker_rocket_damage), 0, (autocvar_g_turrets_unit_walker_rocket_radius), self, world, (autocvar_g_turrets_unit_walker_rocket_force), DEATH_TURRET_WALK_ROCKET, world);
     remove (self);
 }
 
 void walker_rocket_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
-{
+{SELFPARAM();
     self.health = self.health - damage;
     self.velocity = self.velocity + vforce;
 
@@ -102,7 +102,7 @@ void walker_rocket_damage (entity inflictor, entity attacker, float damage, floa
 #define WALKER_ROCKET_MOVE movelib_move_simple(newdir, (autocvar_g_turrets_unit_walker_rocket_speed), (autocvar_g_turrets_unit_walker_rocket_turnrate)); UpdateCSQCProjectile(self)
 void walker_rocket_loop();
 void walker_rocket_think()
-{
+{SELFPARAM();
     vector newdir;
     float edist;
     float itime;
@@ -157,7 +157,7 @@ void walker_rocket_think()
 }
 
 void walker_rocket_loop3()
-{
+{SELFPARAM();
     vector newdir;
     self.nextthink = time;
 
@@ -180,7 +180,7 @@ void walker_rocket_loop3()
 }
 
 void walker_rocket_loop2()
-{
+{SELFPARAM();
     vector newdir;
 
     self.nextthink = time;
@@ -203,7 +203,7 @@ void walker_rocket_loop2()
 }
 
 void walker_rocket_loop()
-{
+{SELFPARAM();
     self.nextthink = time;
     self.tur_shotorg = self.origin + '0 0 300';
     self.think = walker_rocket_loop2;
@@ -211,7 +211,7 @@ void walker_rocket_loop()
 }
 
 void walker_fire_rocket(vector org)
-{
+{SELFPARAM();
     entity rocket;
 
     fixedmakevectors(self.angles);
@@ -221,7 +221,7 @@ void walker_fire_rocket(vector org)
     rocket = spawn ();
     setorigin(rocket, org);
 
-    sound (self, CH_WEAPON_A, W_Sound("hagar_fire"), VOL_BASE, ATTEN_NORM);
+    sound (self, CH_WEAPON_A, SND_HAGAR_FIRE, VOL_BASE, ATTEN_NORM);
     setsize (rocket, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
 
     rocket.classname		  = "walker_rocket";
@@ -258,7 +258,7 @@ void walker_fire_rocket(vector org)
 .vector enemy_last_loc;
 .float enemy_last_time;
 void walker_move_to(vector _target, float _dist)
-{
+{SELFPARAM();
     switch (self.waterlevel)
     {
         case WATERLEVEL_NONE:
@@ -290,7 +290,7 @@ void walker_move_to(vector _target, float _dist)
 //#define WALKER_FANCYPATHING
 
 void walker_move_path()
-{
+{SELFPARAM();
 #ifdef WALKER_FANCYPATHING
     // Are we close enougth to a path node to switch to the next?
     if (vlen(self.origin  - self.pathcurrent.origin) < 64)
@@ -334,15 +334,15 @@ void walker_move_path()
 #endif
 }
 
-void spawnfunc_turret_walker() { if(!turret_initialize(TUR_WALKER)) remove(self); }
+void spawnfunc_turret_walker() { SELFPARAM(); if(!turret_initialize(TUR_WALKER)) remove(self); }
 
 float t_walker(float req)
-{
+{SELFPARAM();
     switch(req)
     {
         case TR_ATTACK:
         {
-            sound (self, CH_WEAPON_A, W_Sound("uzi_fire"), VOL_BASE, ATTEN_NORM);
+            sound (self, CH_WEAPON_A, SND_UZI_FIRE, VOL_BASE, ATTEN_NORM);
             fireBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, 0, self.shot_dmg, self.shot_force, DEATH_TURRET_WALK_GUN, 0);
             Send_Effect(EFFECT_BLASTER_MUZZLEFLASH, self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
 
@@ -634,10 +634,6 @@ float t_walker(float req)
         }
         case TR_PRECACHE:
         {
-            precache_model ("models/turrets/walker_body.md3");
-            precache_model ("models/turrets/walker_head_minigun.md3");
-            precache_model ("models/turrets/rocket.md3");
-            precache_sound (W_Sound("rocket_impact"));
             return true;
         }
     }
@@ -648,10 +644,10 @@ float t_walker(float req)
 #endif // SVQC
 #ifdef CSQC
 
-#include "../../../server/movelib.qh"
+#include "../../../client/movelib.qh"
 
 void walker_draw()
-{
+{SELFPARAM();
     float dt;
 
     dt = time - self.move_time;
@@ -671,7 +667,7 @@ void walker_draw()
 }
 
 float t_walker(float req)
-{
+{SELFPARAM();
     switch(req)
     {
         case TR_SETUP: