summaryrefslogtreecommitdiff
path: root/world/map/npc/functions
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-02-03 17:31:07 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-02-12 23:05:14 +0100
commit3a50328148c111d329322f5930c5332eb0c5dc48 (patch)
tree228f8a6b47f5b7bf13bf4ca1f08a58f1d8c7a724 /world/map/npc/functions
parent19058b8fc8a2e85562be1564d6fdcd03f1545fe8 (diff)
downloadserverdata-3a50328148c111d329322f5930c5332eb0c5dc48.tar.gz
serverdata-3a50328148c111d329322f5930c5332eb0c5dc48.tar.bz2
serverdata-3a50328148c111d329322f5930c5332eb0c5dc48.tar.xz
serverdata-3a50328148c111d329322f5930c5332eb0c5dc48.zip
Variable restructuring: move Quest_demon_mines into Nibble 2 of QUEST_Hurnscald.
Diffstat (limited to 'world/map/npc/functions')
-rw-r--r--world/map/npc/functions/clear_vars.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index ff0bdb02..d0ca5313 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -111,6 +111,11 @@ function|script|ClearVariables|{
set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_1_MASK)) | (QUEST_Scythe_state << NIBBLE_1_SHIFT);
set QUEST_Scythe_state, 0;
+ // move Demon Mask quest into bitmasked variable QUEST_Hurnscald
+ if (QUEST_demon_mines)
+ set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_2_MASK)) | (QUEST_demon_mines << NIBBLE_2_SHIFT);
+ set QUEST_demon_mines, 0;
+
//These lines are needed to migrate stuff from variables to flags
if (Open_Underground_Palace_Barrier)
set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;