gravity fix
authorRudolf Polzer <divverent@alientrap.org>
Sat, 8 May 2010 18:29:55 +0000 (20:29 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 8 May 2010 18:29:55 +0000 (20:29 +0200)
qcsrc/client/damage.qc
qcsrc/client/projectile.qc
qcsrc/server/csqcprojectile.qc

index 89edacd..59e8469 100644 (file)
@@ -242,15 +242,15 @@ void Ent_DamageInfo(float isNew)
                        case WEP_FIREBALL:
                                if(secondary)
                                {
+                                       // firemine goes out silently
+                               }
+                               else
+                               {
                                        org2 = org + backoff * 16;
                                        pointparticles(particleeffectnum("fireball_explode"), org2, '0 0 0', 1);
                                        if(!issilent)
                                                sound(self, CHAN_PROJECTILE, "weapons/fireball_impact2.wav", VOL_BASE, ATTN_NORM * 0.25); // long range boom
                                }
-                               else
-                               {
-                                       // firemine goes out silently
-                               }
                                break;
                        default:
                                dprint("Unhandled damage of weapon ", ftos(hitwep), "\n");
index 9a2907c..dc5183f 100644 (file)
@@ -216,7 +216,7 @@ void Ent_Projectile()
                        if(f & 0x10)
                                self.gravity = ReadCoord();
                        else
-                               self.gravity = 0; // default
+                               self.gravity = 0; // none
                        self.move_origin = self.origin;
                        self.move_velocity = self.velocity;
                }
index 49076bb..d250d39 100644 (file)
@@ -21,7 +21,7 @@ float CSQCProjectile_SendEntity(entity to, float sf)
                        sf |= 0x20;
        }
 
-       if(self.gravity != 0 && self.gravity != 1)
+       if(self.gravity != 0)
                sf |= 0x10;
 
        WriteByte(MSG_ENTITY, ENT_CLIENT_PROJECTILE);