diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/functions/clear_vars.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/functions/clear_vars.txt')
| -rw-r--r-- | world/map/npc/functions/clear_vars.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/world/map/npc/functions/clear_vars.txt b/world/map/npc/functions/clear_vars.txt index 6cc311fe..1aa84d2b 100644 --- a/world/map/npc/functions/clear_vars.txt +++ b/world/map/npc/functions/clear_vars.txt @@ -1,6 +1,7 @@ // Clears old variables -function|script|ClearVariables|{ +function|script|ClearVariables|, +{ set EasterQuest, 0; // Halloween 2006 @@ -184,8 +185,8 @@ L_Fix_Full: // The variable TMW_Quest was used to save the progress in several subquests linearly. // The subquests are moved to different nibbles of other variables // to make it possible to do some of the quests in parallel. -function|script|ClearVarTMW_Quest|{ - +function|script|ClearVarTMW_Quest|, +{ if (TMW_Quest == 0) goto L_Done; if (TMW_Quest <= 6) goto L_Bernard_Mikhail; if (TMW_Quest <= 8) goto L_Sarah; @@ -231,7 +232,8 @@ L_Done: return; } --|script|#ClearGlobalVars|-1,{ +-|script|#ClearGlobalVars|-1, +{ OnInit: // Clear some entries of the arrays which save the Fluffy Hunting highscore list |