From a85986cce71a9632d3920908ba3214fb9cd95592 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Wed, 1 Apr 2015 13:47:05 +1100
Subject: [PATCH] NR: cleanup and improvements to death macros

---
 .../Northern_Rebirth/utils/herodeaths.cfg     | 53 ++++++++-----------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
index 0f980d7f99c9..4ca7f5d29467 100644
--- a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
+++ b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
@@ -9,10 +9,7 @@
             id=Tallin
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker=Tallin
@@ -38,10 +35,7 @@
             id=Camerin
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker=Camerin
@@ -99,10 +93,7 @@
             id=Krash
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker=Father Morvin
@@ -202,7 +193,7 @@
 #define HERODEATH_THERA_AND_MORVIN_WITH_DIALOG
     [event]
         name=prestart
-        # Morvin and Thera appear first in this scenario.
+
         # These will allow their death/dialogs to play in a row, and then never again,
         # to prevent annoyance.
         {VARIABLE death_dialog_index_thera 1}
@@ -477,7 +468,6 @@
         [/if]
     [/event]
 
-    # Father Morvin - See above
     [event]
         name=last breath
         first_time_only=no
@@ -714,7 +704,6 @@
         {NR_WHITE_MAGE_RESPAWN_AT (Father Morvin)}
     [/event]
 
-    # Father Morvin - See above
     [event]
         name=last breath
         first_time_only=no
@@ -734,10 +723,7 @@
             id="Ro'Sothian"
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker="Ro'Sothian"
@@ -746,6 +732,13 @@
         [/message]
 
         {FLASH_WHITE ()}
+    [/event]
+
+    [event]
+        name=die
+        [filter]
+            id="Ro'Sothian"
+        [/filter]
 
         [message]
             speaker=Tallin
@@ -763,10 +756,7 @@
             id="Ro'Arthian"
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker="Ro'Arthian"
@@ -774,6 +764,13 @@
         [/message]
 
         {FLASH_WHITE ()}
+    [/event]
+
+    [event]
+        name=die
+        [filter]
+            id="Ro'Arthian"
+        [/filter]
 
         [message]
             speaker=Tallin
@@ -793,10 +790,7 @@
             id=Stalrag
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker=Stalrag
@@ -851,10 +845,7 @@
             id=Eryssa
         [/filter]
 
-        [music]
-            name=sad.ogg
-            play_once=yes
-        [/music]
+        {INCIDENTAL_MUSIC sad.ogg}
 
         [message]
             speaker=Eryssa