diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-28 11:41:36 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-28 12:29:02 -0700 |
| commit | bc66a98377575c7c8e9592e50cbdcf083d6ecaff (patch) | |
| tree | d1ecc1c6a99191cce3108199d96fcbe891772f65 /world/map/npc/halloween | |
| parent | 9018aee73b120bd9c5c414abcb5af6da4c7b1bea (diff) | |
| download | serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.gz serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.bz2 serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.tar.xz serverdata-bc66a98377575c7c8e9592e50cbdcf083d6ecaff.zip | |
Refactor all calls within an if, which is illegal
Diffstat (limited to 'world/map/npc/halloween')
| -rw-r--r-- | world/map/npc/halloween/2008/prize_master.txt | 17 | ||||
| -rw-r--r-- | world/map/npc/halloween/2011/trick_or_treat.txt | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/world/map/npc/halloween/2008/prize_master.txt b/world/map/npc/halloween/2008/prize_master.txt index d2accb34..34d4236b 100644 --- a/world/map/npc/halloween/2008/prize_master.txt +++ b/world/map/npc/halloween/2008/prize_master.txt @@ -3,7 +3,10 @@ 010-2.gat,43,32,0 script Prize Master 150,{ if (Halloween08 == 65535) goto L_Finished; - if (Halloween08 == 0) callsub S_Explain; + if (Halloween08 != 0) goto L_DidExplain; + callsub S_Explain; + +L_DidExplain: // Get detailed info about equipment callfunc "ProcessEquip"; @@ -59,7 +62,7 @@ L_Pumpkin_Done: mes "[Prize Master]"; mes "\"I think I've seen this Jack O before.\""; close; - + @@ -76,7 +79,7 @@ L_Axe_Done: mes "[Prize Master]"; mes "\"You've pulled the axe on me already.\""; close; - + @@ -197,7 +200,7 @@ L_GradCap_Done: mes "[Prize Master]"; mes "\"Sorry, professor, but I've already seen you.\""; close; - + @@ -222,7 +225,7 @@ L_NohMask_Done: mes "\"I've caught you trying to get another prize for the same mask.\""; close; - + @@ -366,9 +369,9 @@ L_BCowboy_BadTorso: mes "[Prize Master]"; mes "\"Fashion doesn't seem to be your forte. Try to match that hat better.\""; close; - - + + L_Antler: diff --git a/world/map/npc/halloween/2011/trick_or_treat.txt b/world/map/npc/halloween/2011/trick_or_treat.txt index b5fc7ba3..1b502d65 100644 --- a/world/map/npc/halloween/2011/trick_or_treat.txt +++ b/world/map/npc/halloween/2011/trick_or_treat.txt @@ -7,6 +7,7 @@ //+ set @hw2011_npc_id, $@hw2011_npc_vincent; //+ if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day) //+ callfunc "TrickOrTreat2011"; +// Later note: it turns out that callfunc in an "if" is actually illegal. // Variables: // $@hw2011_maskmemory = Sliced Array containing the record of the last masks used to trick or treat each NPC. |