Use SELFPARAM() in every function that uses self

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / weapons / projectile.qc

diff --git a/qcsrc/client/weapons/projectile.qc b/qcsrc/client/weapons/projectile.qc
index 90d3a29e68a2b7bef80f7688945f2bad59109c31..7f13ab5dfe5455c31baa259cfe9a5feb8bd88510 100644 (file)
--- a/qcsrc/client/weapons/projectile.qc
+++ b/qcsrc/client/weapons/projectile.qc
@@ -18,19 +18,19 @@
 .vector colormod;
 
 void SUB_Stop()
-{
+{SELFPARAM();
        self.move_velocity = self.move_avelocity = '0 0 0';
        self.move_movetype = MOVETYPE_NONE;
 }
 
 void Projectile_ResetTrail(vector to)
-{
+{SELFPARAM();
        self.trail_oldorigin = to;
        self.trail_oldtime = time;
 }
 
 void Projectile_DrawTrail(vector to)
-{
+{SELFPARAM();
        vector from;
        float t0;
 
@@ -52,7 +52,7 @@ void Projectile_DrawTrail(vector to)
 }
 
 void Projectile_Draw()
-{
+{SELFPARAM();
        vector rot;
        vector trailorigin;
        int f;
@@ -166,7 +166,7 @@ void Projectile_Draw()
 }
 
 void loopsound(entity e, int ch, string samp, float vol, float attn)
-{
+{SELFPARAM();
        if(self.silent)
                return;
 
@@ -175,7 +175,7 @@ void loopsound(entity e, int ch, string samp, float vol, float attn)
 }
 
 void Ent_RemoveProjectile()
-{
+{SELFPARAM();
        if(self.count & 0x80)
        {
                tracebox(self.origin, self.mins, self.maxs, self.origin + self.velocity * 0.05, MOVE_NORMAL, self);
@@ -184,7 +184,7 @@ void Ent_RemoveProjectile()
 }
 
 void Ent_Projectile()
-{
+{SELFPARAM();
        int f;
 
        // projectile properties:
@@ -270,6 +270,9 @@ void Ent_Projectile()
 
        if(f & 2)
        {
+               string rm_suffix = strcat("rocketminsta_laser_", Static_Team_ColorName_Lower(self.team));
+               if(_particleeffectnum(rm_suffix) < 0 || Team_TeamToNumber(self.team) == -1) { rm_suffix = "TR_NEXUIZPLASMA"; }
+
                self.cnt = ReadByte();
 
                self.silent = (self.cnt & 0x80);
@@ -317,13 +320,15 @@ void Ent_Projectile()
 
                        case PROJECTILE_RPC: setmodel(self, W_Model("ok_rocket"));self.traileffect = particleeffectnum(EFFECT_TR_ROCKET); break;
 
+                       case PROJECTILE_ROCKETMINSTA_LASER: setmodel(self, "models/elaser.mdl");self.traileffect = _particleeffectnum(rm_suffix); break;
+
                        default:
                                if(MUTATOR_CALLHOOK(Ent_Projectile, self))
                                        break;
 
                                if (Nade_FromProjectile(self.cnt) != NADE_TYPE_NULL)
                                {
-                                       setmodel(self, W_Model("v_ok_grenade"));
+                                       setmodel(self, W_Model("v_ok_grenade.md3"));
                                        self.traileffect = _particleeffectnum(Nade_TrailEffect(self.cnt, self.team));
                                        break;
                                }
@@ -516,8 +521,8 @@ void Projectile_Precache()
        precache_model("models/tracer.mdl");
        precache_model("models/sphere/sphere.md3");
 
-       precache_model(W_Model("v_ok_grenade"));
-       precache_model(W_Model("ok_rocket"));
+       precache_model(W_Model("v_ok_grenade.md3"));
+       precache_model(W_Model("ok_rocket.md3"));
 
        precache_sound(W_Sound("electro_fly"));
        precache_sound(W_Sound("rocket_fly"));