From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 8 May 2010 18:29:55 +0000 (+0200)
Subject: gravity fix
X-Git-Tag: xonotic-v0.1.0preview~640^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=303abe8198fca21cf0f0521b0e34ba877ab21c14;p=xonotic%2Fxonotic-data.pk3dir.git

gravity fix
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 89edacd94..59e84690b 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -241,16 +241,16 @@ void Ent_DamageInfo(float isNew)
 				break;
 			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");
diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc
index 9a2907c5c..dc5183f28 100644
--- a/qcsrc/client/projectile.qc
+++ b/qcsrc/client/projectile.qc
@@ -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;
 		}
diff --git a/qcsrc/server/csqcprojectile.qc b/qcsrc/server/csqcprojectile.qc
index 49076bb81..d250d39de 100644
--- a/qcsrc/server/csqcprojectile.qc
+++ b/qcsrc/server/csqcprojectile.qc
@@ -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);