diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-02-12 23:06:27 +0100 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-02-12 23:06:27 +0100 |
| commit | 627a802f4eeb0872ab84d32ef952ca8884cea795 (patch) | |
| tree | b62300599d9f82f986769d0b501d9b18c83123f6 /world/map/npc/018-2/caul.txt | |
| parent | 776515d46c6ffe47334537c32fc1b55f26fe47e4 (diff) | |
| parent | e0e679a8a695641d1845c28bebe1c7e83c21a39f (diff) | |
| download | serverdata-627a802f4eeb0872ab84d32ef952ca8884cea795.tar.gz serverdata-627a802f4eeb0872ab84d32ef952ca8884cea795.tar.bz2 serverdata-627a802f4eeb0872ab84d32ef952ca8884cea795.tar.xz serverdata-627a802f4eeb0872ab84d32ef952ca8884cea795.zip | |
Merge branch 'variables'
Several older scripts were changed to use bitmasking for the player variables.
Variables that are or became unused were added to the clear_vars function.
Diffstat (limited to 'world/map/npc/018-2/caul.txt')
| -rw-r--r-- | world/map/npc/018-2/caul.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt index f1e9ac90..3b5f771f 100644 --- a/world/map/npc/018-2/caul.txt +++ b/world/map/npc/018-2/caul.txt @@ -8,6 +8,10 @@ //################################################################################# 018-2.gat,37,22,0|script|Caul|107,{ + callfunc "ClearVariables"; + + set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT); + set @SETZER_INITIAL, 0; set @SETZER_KNOWS_OIL, 1; set @SETZER_KNOWS_STINGER, 2; @@ -59,7 +63,7 @@ L_M_no_monster_oil: set @choices_nr, @choices_nr + 1; L_M_no_mopox_cure: - if (Inspector != 10) + if (@inspector != 10) goto L_M_no_inspector; set @choice_idx[@choices_nr], @C_nohmask; @@ -1058,10 +1062,11 @@ L_calc_dempo_color: L_NohMask: mes "[Caul]"; mes "\"I'm sorry, but I didn't. I'm staying in town. Try asking one of the miners.\""; - close; + goto L_close; L_close: - close; + set @inspector, 0; + close; S_Update_Var: set QUEST_Forestbow_state, |