fix a crash with crylink when only using 1 shot; fix fade_rate networking

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / csqcprojectile.qc

diff --git a/qcsrc/server/csqcprojectile.qc b/qcsrc/server/csqcprojectile.qc
index 49076bb813537061bd02fad06ffd43fb4dd65535..31e5b7788513b7eb180cd929c10d46bae871fc08 100644 (file)
--- a/qcsrc/server/csqcprojectile.qc
+++ b/qcsrc/server/csqcprojectile.qc
@@ -13,7 +13,7 @@ float CSQCProjectile_SendEntity(entity to, float sf)
        if(self.flags & FL_ONGROUND)
                sf |= 0x40;
 
-       if(self.fade_time != 0 && self.fade_rate != 0)
+       if(self.fade_time != 0 || self.fade_rate != 0)
        {
                ft = (self.fade_time - time) / sys_frametime;
                fr = (1 / self.fade_rate) / sys_frametime;
@@ -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);