From: Mario <zacjardine@y7mail.com>
Date: Sun, 23 Aug 2015 11:02:02 +0000 (+1000)
Subject: Use new item stuff
X-Git-Tag: xonotic-v0.8.2~2049^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13b9257c9f5fa94d53990bcdf9ceadf2574c95a7;p=xonotic%2Fxonotic-data.pk3dir.git

Use new item stuff
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 31ebc2f85..88744acc0 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -254,10 +254,10 @@ string formatmessage(string msg)
 	n = 7;
 
 	ammoitems = "batteries";
-	if(self.items & IT_PLASMA) ammoitems = "plasma";
-	if(self.items & IT_CELLS) ammoitems = "cells";
-	if(self.items & IT_ROCKETS) ammoitems = "rockets";
-	if(self.items & IT_SHELLS) ammoitems = "shells";
+	if(self.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name;
+	if(self.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name;
+	if(self.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name;
+	if(self.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name;
 
 	WarpZone_crosshair_trace(self);
 	cursor = trace_endpos;