[nexuiz-commits] r6372 - in trunk/data: gfx qcsrc/client qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-30 07:47:13 -0400 (Mon, 30 Mar 2009)
New Revision: 6372

Added:
   trunk/data/gfx/sb_fuel.tga
Modified:
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/server/t_items.qc
Log:
add a fuel icon to the sbar


Added: trunk/data/gfx/sb_fuel.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/gfx/sb_fuel.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-03-30 11:24:00 UTC (rev 6371)
+++ trunk/data/qcsrc/client/sbar.qc	2009-03-30 11:47:13 UTC (rev 6372)
@@ -1754,7 +1754,7 @@
 	{
 		case 0: return "gfx/sb_shells";
 		case 1: return "gfx/sb_bullets";
-		case 2: return "gfx/sb_rockets";
+		case 2: return "gfx/sb_rocket";
 		case 3: return "gfx/sb_cells";
 		case 4: return "gfx/sb_fuel";
 		default: return "";

Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc	2009-03-30 11:24:00 UTC (rev 6371)
+++ trunk/data/qcsrc/server/t_items.qc	2009-03-30 11:47:13 UTC (rev 6372)
@@ -180,7 +180,7 @@
 			}
 		}
 
-		if((it = (item.items - (item.items & player.items) & IT_PICKUPMASK)))
+		if((it = (item.items - (item.items & player.items)) & IT_PICKUPMASK))
 		{
 			pickedup = TRUE;
 			player.items |= it;