Merge branch 'master' into terencehill/quickmenu

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

diff --git a/qcsrc/common/turrets/unit/walker.qc b/qcsrc/common/turrets/unit/walker.qc
index 4a63f9dee7ae772c1c1f6f7992e0ac50615dccfa..4a9ca77afe1b4e34e15b408f034ab928e6b8ca7d 100644 (file)
--- a/qcsrc/common/turrets/unit/walker.qc
+++ b/qcsrc/common/turrets/unit/walker.qc
@@ -221,7 +221,7 @@ void walker_fire_rocket(vector org)
     rocket = spawn ();
     setorigin(rocket, org);
 
-    sound (self, CH_WEAPON_A, "weapons/hagar_fire.wav", VOL_BASE, ATTEN_NORM);
+    sound (self, CH_WEAPON_A, W_Sound("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";
@@ -342,9 +342,9 @@ float t_walker(float req)
     {
         case TR_ATTACK:
         {
-            sound (self, CH_WEAPON_A, "weapons/uzi_fire.wav", VOL_BASE, ATTEN_NORM);
+            sound (self, CH_WEAPON_A, W_Sound("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("laser_muzzleflash", self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
+            Send_Effect(EFFECT_BLASTER_MUZZLEFLASH, self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
 
             return true;
         }
@@ -613,12 +613,12 @@ float t_walker(float req)
                 e = find(world, targetname, self.target);
                 if (!e)
                 {
-                    dprint("Initital waypoint for walker does NOT exsist, fix your map!\n");
+                    LOG_TRACE("Initital waypoint for walker does NOT exsist, fix your map!\n");
                     self.target = "";
                 }
 
                 if (e.classname != "turret_checkpoint")
-                    dprint("Warning: not a turrret path\n");
+                    LOG_TRACE("Warning: not a turrret path\n");
                 else
                 {
 #ifdef WALKER_FANCYPATHING
@@ -637,7 +637,7 @@ float t_walker(float req)
             precache_model ("models/turrets/walker_body.md3");
             precache_model ("models/turrets/walker_head_minigun.md3");
             precache_model ("models/turrets/rocket.md3");
-            precache_sound ("weapons/rocket_impact.wav");
+            precache_sound (W_Sound("rocket_impact"));
             return true;
         }
     }