Draw: purge SELFPARAM

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / vehicle / bumblebee_weapons.qc

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
index 5838b7358a6e37d383b32cc828e169e2aacaf881..79252e13cbb2401c5557d405625e16f8bf2c2381 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc
@@ -17,7 +17,7 @@ float autocvar_g_vehicle_bumblebee_cannon_speed;
 float autocvar_g_vehicle_bumblebee_cannon_spread;
 float autocvar_g_vehicle_bumblebee_cannon_force;
 
-float bumble_raygun_send(entity to, int sf);
+bool bumble_raygun_send(entity this, entity to, int sf);
 
 void bumblebee_fire_cannon(entity _gun, string _tagname, entity _owner)
 {
@@ -28,8 +28,8 @@ void bumblebee_fire_cannon(entity _gun, string _tagname, entity _owner)
                         DEATH_VH_BUMB_GUN, PROJECTILE_BUMBLE_GUN, 0, true, true, _owner);
 }
 
-float bumble_raygun_send(entity to, float sf)
-{SELFPARAM();
+bool bumble_raygun_send(entity this, entity to, float sf)
+{
     WriteByte(MSG_ENTITY, ENT_CLIENT_BUMBLE_RAYGUN);
 
     WriteByte(MSG_ENTITY, sf);
@@ -61,7 +61,7 @@ float bumble_raygun_send(entity to, float sf)
 
 #ifdef CSQC
 
-void bumble_raygun_draw();
+void bumble_raygun_draw(entity this);
 
 void bumble_raygun_read(bool bIsNew)
 {SELFPARAM();
@@ -78,7 +78,7 @@ void bumble_raygun_read(bool bIsNew)
         else
             self.colormod = '0 1 0';
 
-        self.traileffect = particleeffectnum(EFFECT_BUMBLEBEE_HEAL_MUZZLEFLASH);
+        self.traileffect = EFFECT_BUMBLEBEE_HEAL_MUZZLEFLASH.m_id;
         self.lip = particleeffectnum(EFFECT_BUMBLEBEE_HEAL_IMPACT);
 
         self.draw = bumble_raygun_draw;
@@ -101,8 +101,8 @@ void bumble_raygun_read(bool bIsNew)
     }
 }
 
-void bumble_raygun_draw()
-{SELFPARAM();
+void bumble_raygun_draw(entity this)
+{
     float _len;
     vector _dir;
     vector _vtmp1, _vtmp2;
@@ -112,7 +112,7 @@ void bumble_raygun_draw()
 
     if(self.total_damages < time)
     {
-        boxparticles(self.traileffect, self, self.origin, self.origin + _dir * -64, _dir * -_len , _dir * -_len, 1, PARTICLES_USEALPHA);
+        boxparticles(particleeffectnum(Effects[self.traileffect]), self, self.origin, self.origin + _dir * -64, _dir * -_len , _dir * -_len, 1, PARTICLES_USEALPHA);
         boxparticles(self.lip, self, self.move_origin, self.move_origin + _dir * -64, _dir * -200 , _dir * -200, 1, PARTICLES_USEALPHA);
         self.total_damages = time + 0.1;
     }