summaryrefslogtreecommitdiff
path: root/npc/005-1_Snake_desert
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-01-07 15:10:18 -0700
committerFate <fate-tmw@googlemail.com>2009-01-07 15:10:18 -0700
commitb2ec357e68a1b2e692f1c1081c4cc4f11682576a (patch)
tree6498985ddbb50a8f5405ff6760d4a0c9ae5da7c4 /npc/005-1_Snake_desert
parentc226d805845e2717b101788c4db5750abcce7c5b (diff)
downloadserverdata-b2ec357e68a1b2e692f1c1081c4cc4f11682576a.tar.gz
serverdata-b2ec357e68a1b2e692f1c1081c4cc4f11682576a.tar.bz2
serverdata-b2ec357e68a1b2e692f1c1081c4cc4f11682576a.tar.xz
serverdata-b2ec357e68a1b2e692f1c1081c4cc4f11682576a.zip
Misc. fixes, added most of Wyara
Diffstat (limited to 'npc/005-1_Snake_desert')
-rw-r--r--npc/005-1_Snake_desert/tree.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1_Snake_desert/tree.txt
index 1f033c63..d0072259 100644
--- a/npc/005-1_Snake_desert/tree.txt
+++ b/npc/005-1_Snake_desert/tree.txt
@@ -53,13 +53,13 @@ function script QuestTreeTouch {
if (@Q_status == 3)
goto L_happy;
- if (@Q_KNOWS_CUTTREE && (!(MAGIC_FLAGS & MFLAG_KNOWS_DRUIDTREE)))
+ if ((MAGIC_FLAGS & (MFLAG_KNOWS_DRUIDTREE | MFLAG_KNOWS_CUTTREE)) == MFLAG_KNOWS_CUTTREE)
goto L_cut;
- if (!@Q_KNOWS_CUTTREE && ((MAGIC_FLAGS & MFLAG_KNOWS_DRUIDTREE)))
+ if ((MAGIC_FLAGS & (MFLAG_KNOWS_DRUIDTREE | MFLAG_KNOWS_CUTTREE)) == MFLAG_KNOWS_DRUIDTREE)
goto L_water;
- if (@Q_KNOWS_CUTTREE && ((MAGIC_FLAGS & MFLAG_KNOWS_DRUIDTREE)))
+ if ((MAGIC_FLAGS & (MFLAG_KNOWS_DRUIDTREE | MFLAG_KNOWS_CUTTREE)) > 0) //i.e., both are set
goto L_both;
close;