summaryrefslogtreecommitdiff
path: root/world/map/npc/functions
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-02-03 14:37:57 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-02-12 23:05:14 +0100
commit19058b8fc8a2e85562be1564d6fdcd03f1545fe8 (patch)
tree05d83203478a15e03c9fe96930b201ecb7886afe /world/map/npc/functions
parentf86e4abea0d82e1e0ed24110101188ef8fccd541 (diff)
downloadserverdata-19058b8fc8a2e85562be1564d6fdcd03f1545fe8.tar.gz
serverdata-19058b8fc8a2e85562be1564d6fdcd03f1545fe8.tar.bz2
serverdata-19058b8fc8a2e85562be1564d6fdcd03f1545fe8.tar.xz
serverdata-19058b8fc8a2e85562be1564d6fdcd03f1545fe8.zip
Variable restructuring: move Quest_Scythe_state into Nibble 1 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 14e9cc5f..ff0bdb02 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -106,6 +106,11 @@ function|script|ClearVariables|{
// quest was turned into a Daily Quest, so the variable isn't needed anymore
set CaveSnakeLamp, 0;
+ // move Scythe quest into bitmasked variable QUEST_Hurnscald
+ if (QUEST_Scythe_state)
+ set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_1_MASK)) | (QUEST_Scythe_state << NIBBLE_1_SHIFT);
+ set QUEST_Scythe_state, 0;
+
//These lines are needed to migrate stuff from variables to flags
if (Open_Underground_Palace_Barrier)
set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;