Merge branch 'master' into mirceakitsune/per_character_sounds

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

diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index b22a5b9dbd1242e952ca26ff79ac4dc2bdcde629..dc5183f28b037a16deac05755acb20b54c6f8819 100644 (file)
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -158,11 +158,9 @@ void Ent_RemoveProjectile()
        }
 }
 
-.float bouncefactor;
-.float bouncestop;
 void Ent_Projectile()
 {
-       float f, s;
+       float f;
 
        // projectile properties:
        //   kind (interpolated, or clientside)
@@ -215,23 +213,15 @@ void Ent_Projectile()
                        self.velocity_x = ReadCoord();
                        self.velocity_y = ReadCoord();
                        self.velocity_z = ReadCoord();
-                       self.gravity = ReadCoord();
-
-                       s = ReadByte();
-
-                       if (s & 1)
-                       {
-                               self.bouncefactor = ReadCoord();
-                               self.bouncestop = ReadCoord();
-                       }
-
+                       if(f & 0x10)
+                               self.gravity = ReadCoord();
+                       else
+                               self.gravity = 0; // none
                        self.move_origin = self.origin;
                        self.move_velocity = self.velocity;
-                       self.move_bounce_factor = self.bouncefactor;
-                       self.move_bounce_stopspeed = self.bouncestop;
                }
 
-               if(time == self.spawntime || (self.count & 0x80) || (f & 0x10))
+               if(time == self.spawntime || (self.count & 0x80) || (f & 0x08))
                {
                        self.trail_oldorigin = self.origin;
                        if(!(self.count & 0x80))
@@ -316,6 +306,8 @@ void Ent_Projectile()
                                self.maxs = '0 0 -3';
                                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;
                                break;
                        case PROJECTILE_PORTO_RED:
                                self.colormod = '2 1 1';