From: Mario <zacjardine@y7mail.com>
Date: Sat, 25 Apr 2015 04:21:18 +0000 (+1000)
Subject: Fix copy of ammo_none in defs.qh
X-Git-Tag: xonotic-v0.8.1~64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7c23ed5b3de9accee0ebceba1b5e207af57e39c2;p=xonotic%2Fxonotic-data.pk3dir.git

Fix copy of ammo_none in defs.qh
---

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 860913f26..54d1ed041 100644
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -527,7 +527,7 @@ float client_cefc_accumulatortime;
 #endif
 
 .float weapon_load[WEP_MAXCOUNT];
-.float ammo_none; // used by the reloading system, must always be 0
+.int ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;
 .float clip_size;
@@ -539,7 +539,7 @@ float client_cefc_accumulatortime;
 .float vortex_chargepool_ammo;
 .float hagar_load;
 
-.float grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab
+.int grab; // 0 = can't grab, 1 = owner can grab, 2 = owner and team mates can grab, 3 = anyone can grab
 
 #define PROJECTILE_MAKETRIGGER(e) (e).solid = SOLID_CORPSE; (e).dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE
 // when doing this, hagar can go through clones