From: Samual Lenks <samual@xonotic.org>
Date: Tue, 20 Aug 2013 22:05:47 +0000 (-0400)
Subject: Start adding MSG_CHOICE, which better handles user choices
X-Git-Tag: xonotic-v0.8.0~341^2~36
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=d2d89bc1e2e88f8d561ea2615a4e0a78cc89d982

Start adding MSG_CHOICE, which better handles user choices
---

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 915c0cbac7..d819814284 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -9,6 +9,7 @@
 #define MSG_CENTER 3 // "Personal" centerprint messages
 #define MSG_CENTER_CPID 4 // Kill centerprint message
 #define MSG_MULTI 5 // Subcall MSG_INFO and/or MSG_CENTER notifications
+#define MSG_CHOICE 6 // Choose which subcall wrapper to activate
 
 #define NO_MSG -12345 
 
@@ -568,7 +569,7 @@ void Send_Notification_WOVA(
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_FALL,                    NO_MSG,        INFO_DEATH_MURDER_FALL,                    NO_MSG) \
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_FIRE,                    NO_MSG,        INFO_DEATH_MURDER_FIRE,                    NO_MSG) \
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_LAVA,                    NO_MSG,        INFO_DEATH_MURDER_LAVA,                    NO_MSG) \
-	MSG_MULTI_NOTIF(1, DEATH_MURDER_NADE,                    NO_MSG,        INFO_DEATH_MURDER_NADE,                   NO_MSG) \
+	MSG_MULTI_NOTIF(1, DEATH_MURDER_NADE,                    NO_MSG,        INFO_DEATH_MURDER_NADE,                    NO_MSG) \
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_SHOOTING_STAR,           NO_MSG,        INFO_DEATH_MURDER_SHOOTING_STAR,           NO_MSG) \
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_SLIME,                   NO_MSG,        INFO_DEATH_MURDER_SLIME,                   NO_MSG) \
 	MSG_MULTI_NOTIF(1, DEATH_MURDER_SWAMP,                   NO_MSG,        INFO_DEATH_MURDER_SWAMP,                   NO_MSG) \
@@ -685,6 +686,13 @@ void Send_Notification_WOVA(
 	MSG_MULTI_NOTIF(1, WEAPON_UZI_MURDER_SNIPE,              NO_MSG,        INFO_WEAPON_UZI_MURDER_SNIPE,              NO_MSG) \
 	MSG_MULTI_NOTIF(1, WEAPON_UZI_MURDER_SPRAY,              NO_MSG,        INFO_WEAPON_UZI_MURDER_SPRAY,              NO_MSG)
 
+#define MSG_ANNCE_NOTIFICATIONS \
+	MSG_ANNCE_NOTIF(1, CHOICE_FRAG,         MSG_CENTER, CENTER_DEATH_MURDER_FRAG,      MSG_CENTER, CENTER_DEATH_MURDER_FRAG_VERBOSE) \
+	MSG_ANNCE_NOTIF(1, CHOICE_FRAGGED,      MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED,   MSG_CENTER, CENTER_DEATH_MURDER_FRAGGED_VERBOSE) \
+	MSG_ANNCE_NOTIF(1, CHOICE_TYPEFRAG,     MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG,  MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAG_VERBOSE) \
+	MSG_ANNCE_NOTIF(1, CHOICE_TYPERFRAGGED, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED, MSG_CENTER, CENTER_DEATH_MURDER_TYPEFRAGGED_VERBOSE) \
+	MSG_ANNCE_NOTIF(2, CHOICE_)
+
 
 // ===========================
 //  Special CVAR Declarations