From: Mario <mario@smbclan.net>
Date: Sat, 2 Jan 2016 02:58:40 +0000 (+1000)
Subject: Don't override alpha to 1 if warpzones exist, fixes solid black items
X-Git-Tag: xonotic-v0.8.2~1324
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=374a6e2ce7d3be8543711a7b32d5b14f72113ec2;p=xonotic%2Fxonotic-data.pk3dir.git

Don't override alpha to 1 if warpzones exist, fixes solid black items
---

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index e9e8c1be7..8cbbbb339 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -110,6 +110,8 @@ void ItemDrawSimple(entity this)
         if(this.move_flags & FL_ONGROUND)
             this.gravity = 0;
     }
+
+    Item_SetAlpha(this);
 }
 
 void Item_PreDraw()
@@ -117,7 +119,7 @@ void Item_PreDraw()
 	if(warpzone_warpzones_exist)
 	{
 		// just incase warpzones were initialized last, reset these
-		self.alpha = 1;
+		//self.alpha = 1; // alpha is already set by the draw function
 		self.drawmask = MASK_NORMAL;
 		return;
 	}