From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 29 Oct 2015 08:36:00 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/debug_draw
X-Git-Tag: xonotic-v0.8.2~1729^2~2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=cd141fba8a7c59fef4b0e98eee651943b18cd99d

Merge branch 'master' into TimePath/debug_draw

# Conflicts:
#	qcsrc/common/items/inventory.qh
---

cd141fba8a7c59fef4b0e98eee651943b18cd99d
diff --cc qcsrc/server/weapons/throwing.qc
index 0670183731,676e3f5d57..d36e2dd469
--- a/qcsrc/server/weapons/throwing.qc
+++ b/qcsrc/server/weapons/throwing.qc
@@@ -34,11 -34,13 +34,12 @@@ string W_ThrowNewWeapon(entity own, flo
  {SELFPARAM();
  	float thisammo, i;
  	string s;
- 	var .int ammotype = (get_weaponinfo(wpn)).ammo_field;
+ 	Weapon info = get_weaponinfo(wpn);
+ 	var .int ammotype = info.ammo_field;
  
 -	entity wep = spawn();
 +	entity wep = new(droppedweapon);
  
  	setorigin(wep, org);
 -	wep.classname = "droppedweapon";
  	wep.velocity = velo;
  	wep.owner = wep.enemy = own;
  	wep.flags |= FL_TOSSED;