X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.qh;h=da8c5ba6e1880050ca7d3e5e534e0affedf49b53;hb=3fc2359b7933352424af07db8f84cbb9342e934f;hp=12bd3b68395a519a2281d236fffb324e7a83e5e7;hpb=39f46e8c5410727a05375a9e703fe6a6fb870241;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh
index 12bd3b683..da8c5ba6e 100644
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@ -5,6 +5,8 @@
 #include <common/constants.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
+#include <common/sounds/sound.qh>
+#include <common/weapons/all.qh>
 
 #ifdef CSQC
 #include <client/autocvars.qh>
@@ -369,7 +371,7 @@ float autocvar_notification_show_sprees_center_specialonly = true;
 	spree_end: placed at the end of murder messages to show ending of sprees
 	spree_lost: placed at the end of suicide messages to show losing of sprees
 	item_wepname: return full name of a weapon from weaponid
-	item_wepammo: ammo display for weapon from string
+	item_wepammo: ammo display for weapon from f1 and f2
 	item_centime: amount of time to display weapon message in centerprint
 	item_buffname: return full name of a buff from buffid
 	death_team: show the full name of the team a player is switching from
@@ -432,16 +434,17 @@ string BUFF_NAME(int i);
 	ARG_CASE(ARG_CS_SV,     "item_wepname",  Weapons_from(f1).m_name) \
 	ARG_CASE(ARG_CS_SV,     "item_buffname", BUFF_NAME(f1)) \
 	ARG_CASE(ARG_CS_SV,     "f3buffname",    BUFF_NAME(f3)) \
-	ARG_CASE(ARG_CS_SV,     "item_wepammo",  (s1 != "" ? sprintf(_(" with %s"), s1) : "")) \
+	ARG_CASE(ARG_CS_SV,     "item_wepammo",  (f2 > 0 ? notif_arg_item_wepammo(f1, f2) : "")) \
 	ARG_CASE(ARG_DC,        "item_centime",  ftos(autocvar_notification_item_centerprinttime)) \
 	ARG_CASE(ARG_SV,        "death_team",    Team_ColoredFullName(f1)) \
 	ARG_CASE(ARG_CS,        "death_team",    Team_ColoredFullName(f1 - 1)) \
 	ARG_CASE(ARG_CS_SV_HA,  "minigame1_name",find(NULL,netname,s1).descriptor.message) \
 	ARG_CASE(ARG_CS_SV_HA,  "minigame1_d",   find(NULL,netname,s1).descriptor.netname)
 
-#define NOTIF_HIT_MAX(count,funcname) MACRO_BEGIN { \
+#define NOTIF_HIT_MAX(count,funcname) MACRO_BEGIN \
 	if(sel_num == count) { backtrace(sprintf("%s: Hit maximum arguments!\n", funcname)); break; } \
-} MACRO_END
+MACRO_END
+
 #define NOTIF_HIT_UNKNOWN(token,funcname) { backtrace(sprintf("%s: Hit unknown token in selected string! '%s'\n", funcname, selected)); break; }
 
 #define KILL_SPREE_LIST \
@@ -623,6 +626,23 @@ string notif_arg_spree_inf(float type, string input, string player, float spree)
 	return "";
 }
 
+string notif_arg_item_wepammo(float f1, float f2)
+{
+	string ammoitems = "";
+	Weapon wep = Weapons_from(f1);
+	switch (wep.ammo_type)
+	{
+		case RES_SHELLS:  ammoitems = ITEM_Shells.m_name;      break;
+		case RES_BULLETS: ammoitems = ITEM_Bullets.m_name;     break;
+		case RES_ROCKETS: ammoitems = ITEM_Rockets.m_name;     break;
+		case RES_CELLS:   ammoitems = ITEM_Cells.m_name;       break;
+		case RES_PLASMA:  ammoitems = ITEM_Plasma.m_name;      break;
+		case RES_FUEL:    ammoitems = ITEM_JetpackFuel.m_name; break;
+		default: return ""; // doesn't use ammo
+	}
+	return sprintf(_(" with %d %s"), f2, ammoitems);
+}
+
 
 // ====================================
 //  Initialization/Create Declarations