summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-02-23 20:13:36 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-02-23 20:13:36 +0100
commit6cdf20622f6e9e697567aa08b821cd51ffe4be40 (patch)
treeec2b21f27a97d8d459a1adaf7aa179eff54aab76 /world/map/npc
parent8600463ff2f55f7e6d3f4358a62bf8b5ef717902 (diff)
downloadserverdata-6cdf20622f6e9e697567aa08b821cd51ffe4be40.tar.gz
serverdata-6cdf20622f6e9e697567aa08b821cd51ffe4be40.tar.bz2
serverdata-6cdf20622f6e9e697567aa08b821cd51ffe4be40.tar.xz
serverdata-6cdf20622f6e9e697567aa08b821cd51ffe4be40.zip
Inspector quest: add the handling of variable restructuring to clear_vars.
This was forgottten in the actual commit about the Inspector quest. That's why it needs extra handling in case a player already started the quest a second time.
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/functions/clear_vars.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt
index 48002fa4..6cc311fe 100644
--- a/world/map/npc/functions/clear_vars.txt
+++ b/world/map/npc/functions/clear_vars.txt
@@ -133,6 +133,13 @@ function|script|ClearVariables|{
set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_2_MASK)) | (QUEST_demon_mines << NIBBLE_2_SHIFT);
set QUEST_demon_mines, 0;
+ // move Inspector quest into bitmasked variable QUEST_Hurnscald
+ set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
+ if (Inspector > @inspector)
+ set QUEST_Hurnscald, (QUEST_Hurnscald & ~(NIBBLE_3_MASK)) | (Inspector << NIBBLE_3_SHIFT);
+ set Inspector, 0;
+ set @inspector, 0;
+
//These lines are needed to migrate stuff from variables to flags
if (Open_Underground_Palace_Barrier)
set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND;