Merge branch 'master' into mirceakitsune/hud_postprocessing

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

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index b67cc76aadc206c591f8f1f3f249ecc394f9af6b..cede03c5a082c3e756cb9378b09885212d843781 100644 (file)
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -22,6 +22,11 @@ void SUB_Stop()
 .float silent;
 .float traileffect;
 
 .float silent;
 .float traileffect;
 

+void Projectile_ResetTrail(vector to)
+{
+       self.trail_oldorigin = to;
+       self.trail_oldtime = time;
+}

 void Projectile_DrawTrail(vector to)
 {
        vector from;
 void Projectile_DrawTrail(vector to)
 {
        vector from;


@@ -38,20 +43,8 @@ void Projectile_DrawTrail(vector to)
 
        if (self.traileffect)
        {
 
        if (self.traileffect)
        {

-               if(checkextension("DP_CSQC_BOXPARTICLES"))
-               {
-                       /* looks good, but we can do better with particle count
-                       particles_alphamin = particles_alphamax = self.alpha;
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, 1, PARTICLES_USEALPHA);
-                       */
-                       /* looks bad
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, self.alpha, 0);
-                       */
-                       particles_alphamin = particles_alphamax = sqrt(self.alpha);
-                       boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);
-               }
-               else
-                       trailparticles(self, self.traileffect, from, to);
+               particles_alphamin = particles_alphamax = sqrt(self.alpha);
+               boxparticles(self.traileffect, self, from, to, self.velocity, self.velocity, sqrt(self.alpha), PARTICLES_USEALPHA);

        }
 }
 
        }
 }
 


@@ -69,9 +62,18 @@ void Projectile_Draw()
        if(self.count & 0x80)
        {
                //self.move_flags &~= FL_ONGROUND;
        if(self.count & 0x80)
        {
                //self.move_flags &~= FL_ONGROUND;

-               Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);
+               if(self.move_movetype == MOVETYPE_NONE || self.move_movetype == MOVETYPE_FLY)
+                       Movetype_Physics_NoMatchServer();
+                       // the trivial movetypes do not have to match the
+                       // server's ticrate as they are ticrate independent
+                       // NOTE: this assumption is only true if MOVETYPE_FLY
+                       // projectiles detonate on impact. If they continue
+                       // moving, we might still be ticrate dependent.
+               else
+                       Movetype_Physics_MatchServer(autocvar_cl_projectiles_sloppy);

                if(!(self.move_flags & FL_ONGROUND))
                if(!(self.move_flags & FL_ONGROUND))

-                       self.angles = vectoangles(self.velocity);
+                       if(self.velocity != '0 0 0')
+                               self.angles = vectoangles(self.velocity);

        }
        else
        {
        }
        else
        {


@@ -135,10 +137,9 @@ void Projectile_Draw()
        if(drawn)
                Projectile_DrawTrail(trailorigin);
        else
        if(drawn)
                Projectile_DrawTrail(trailorigin);
        else

-       {
-               self.trail_oldorigin = trailorigin;
-               self.trail_oldtime = time;
-       }
+               Projectile_ResetTrail(trailorigin);
+
+       self.drawmask = 0;

 
        if(!drawn)
                return;
 
        if(!drawn)
                return;


@@ -153,7 +154,7 @@ void Projectile_Draw()
                        break;
        }
 
                        break;
        }
 

-       R_AddEntity(self);
+       self.drawmask = MASK_NORMAL;

 }
 
 void loopsound(entity e, float ch, string samp, float vol, float attn)
 }
 
 void loopsound(entity e, float ch, string samp, float vol, float attn)


@@ -273,13 +274,14 @@ void Ent_Projectile()
                        case PROJECTILE_ELECTRO: setmodel(self, "models/ebomb.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
                        case PROJECTILE_ROCKET: setmodel(self, "models/rocket.md3");self.traileffect = particleeffectnum("TR_ROCKET"); self.scale = 2; break;
                        case PROJECTILE_BULLET: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_bullet"); break;
                        case PROJECTILE_ELECTRO: setmodel(self, "models/ebomb.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
                        case PROJECTILE_ROCKET: setmodel(self, "models/rocket.md3");self.traileffect = particleeffectnum("TR_ROCKET"); self.scale = 2; break;
                        case PROJECTILE_BULLET: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_bullet"); break;

-                       case PROJECTILE_BULLET_GLOWING: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_bullet"); break;
+                       case PROJECTILE_BULLET_GLOWING: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_rifle_weak"); break;

                        case PROJECTILE_BULLET_GLOWING_TRACER: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_rifle"); break;
                        case PROJECTILE_CRYLINK: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break;
                        case PROJECTILE_CRYLINK_BOUNCING: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break;
                        case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
                        case PROJECTILE_GRENADE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;
                        case PROJECTILE_GRENADE_BOUNCING: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;
                        case PROJECTILE_BULLET_GLOWING_TRACER: setmodel(self, "models/tracer.mdl");self.traileffect = particleeffectnum("tr_rifle"); break;
                        case PROJECTILE_CRYLINK: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break;
                        case PROJECTILE_CRYLINK_BOUNCING: setmodel(self, "models/plasmatrail.mdl");self.traileffect = particleeffectnum("TR_CRYLINKPLASMA"); break;
                        case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break;
                        case PROJECTILE_GRENADE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;
                        case PROJECTILE_GRENADE_BOUNCING: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_GRENADE"); break;

+                       case PROJECTILE_MINE: setmodel(self, "models/mine.md3");self.traileffect = particleeffectnum(""); break;

                        case PROJECTILE_LASER: setmodel(self, "models/laser.mdl");self.traileffect = particleeffectnum(""); break;
                        case PROJECTILE_HLAC: setmodel(self, "models/hlac_bullet.md3");self.traileffect = particleeffectnum(""); break;
                        case PROJECTILE_PORTO_RED: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break;
                        case PROJECTILE_LASER: setmodel(self, "models/laser.mdl");self.traileffect = particleeffectnum(""); break;
                        case PROJECTILE_HLAC: setmodel(self, "models/hlac_bullet.md3");self.traileffect = particleeffectnum(""); break;
                        case PROJECTILE_PORTO_RED: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break;


@@ -309,10 +311,12 @@ void Ent_Projectile()
                        case PROJECTILE_ELECTRO:
                                // only new engines support sound moving with object
                                loopsound(self, CHAN_PROJECTILE, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
                        case PROJECTILE_ELECTRO:
                                // only new engines support sound moving with object
                                loopsound(self, CHAN_PROJECTILE, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);

-                               self.mins = '0 0 -3';
-                               self.maxs = '0 0 -3';
+                               self.mins = '0 0 -4';
+                               self.maxs = '0 0 -4';

                                self.move_movetype = MOVETYPE_BOUNCE;
                                self.move_touch = SUB_Null;
                                self.move_movetype = MOVETYPE_BOUNCE;
                                self.move_touch = SUB_Null;

+                               self.move_bounce_factor = g_balance_electro_secondary_bouncefactor;
+                               self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop;

                                break;
                        case PROJECTILE_ROCKET:
                                loopsound(self, CHAN_PROJECTILE, "weapons/rocket_fly.wav", VOL_BASE, ATTN_NORM);
                                break;
                        case PROJECTILE_ROCKET:
                                loopsound(self, CHAN_PROJECTILE, "weapons/rocket_fly.wav", VOL_BASE, ATTN_NORM);


@@ -320,16 +324,20 @@ void Ent_Projectile()
                                self.maxs = '3 3 3';
                                break;
                        case PROJECTILE_GRENADE:
                                self.maxs = '3 3 3';
                                break;
                        case PROJECTILE_GRENADE:

-                               self.mins = '0 0 -3';
-                               self.maxs = '0 0 -3';
+                               self.mins = '-3 -3 -3';
+                               self.maxs = '3 3 3';

                                break;
                        case PROJECTILE_GRENADE_BOUNCING:
                                break;
                        case PROJECTILE_GRENADE_BOUNCING:

-                               self.mins = '0 0 -3';
-                               self.maxs = '0 0 -3';
+                               self.mins = '-3 -3 -3';
+                               self.maxs = '3 3 3';

                                self.move_movetype = MOVETYPE_BOUNCE;
                                self.move_touch = SUB_Null;
                                self.move_movetype = MOVETYPE_BOUNCE;
                                self.move_touch = SUB_Null;

-                               self.move_bounce_factor = g_balance_grenadelauncher_secondary_bouncefactor;
-                               self.move_bounce_stopspeed = g_balance_grenadelauncher_secondary_bouncestop;
+                               self.move_bounce_factor = g_balance_grenadelauncher_bouncefactor;
+                               self.move_bounce_stopspeed = g_balance_grenadelauncher_bouncestop;
+                               break;
+                       case PROJECTILE_MINE:
+                               self.mins = '-4 -4 -4';
+                               self.maxs = '4 4 4';

                                break;
                        case PROJECTILE_PORTO_RED:
                                self.colormod = '2 1 1';
                                break;
                        case PROJECTILE_PORTO_RED:
                                self.colormod = '2 1 1';


@@ -408,6 +416,7 @@ void Projectile_Precache()
        precache_model("models/ebomb.mdl");
        precache_model("models/elaser.mdl");
        precache_model("models/grenademodel.md3");
        precache_model("models/ebomb.mdl");
        precache_model("models/elaser.mdl");
        precache_model("models/grenademodel.md3");

+       precache_model("models/mine.md3");

        precache_model("models/hagarmissile.mdl");
        precache_model("models/hlac_bullet.md3");
        precache_model("models/laser.mdl");
        precache_model("models/hagarmissile.mdl");
        precache_model("models/hlac_bullet.md3");
        precache_model("models/laser.mdl");