From: Mario <mario@smbclan.net>
Date: Fri, 30 Sep 2016 20:49:56 +0000 (+1000)
Subject: Fix second model sticking after death
X-Git-Tag: xonotic-v0.8.2~326^2~80
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d186bb36ce473d7a8015ba4902524479a8bd7aef;p=xonotic%2Fxonotic-data.pk3dir.git

Fix second model sticking after death
---

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index d2acab1a0..6139d41b4 100644
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -391,7 +391,9 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 {
 	if (name == "")
 	{
-		this.model = "";
+		vector oldmin = this.mins, oldmax = this.maxs;
+		setmodel(this, MDL_Null);
+		setsize(this, oldmin, oldmax);
 		if (this.weaponchild) delete(this.weaponchild);
 		this.weaponchild = NULL;
 		this.movedir = '0 0 0';