diff options
| author | jtoelke <jtoelke@gmx.de> | 2013-06-28 13:18:17 -0700 |
|---|---|---|
| committer | jtoelke <jtoelke@gmx.de> | 2013-06-28 13:18:17 -0700 |
| commit | e8a4dddb3b54814713c411a094fc1a9b90492962 (patch) | |
| tree | 3856e10b80ae965d42b477354a3e5d79c3b04cfb /world/map/npc/009-1/jack.txt | |
| parent | d6d562b4a7bf157a36c0560be4ec14f9f463aa86 (diff) | |
| parent | bc66a98377575c7c8e9592e50cbdcf083d6ecaff (diff) | |
| download | serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.gz serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.bz2 serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.tar.xz serverdata-e8a4dddb3b54814713c411a094fc1a9b90492962.zip | |
Merge pull request #20 from o11c/master
Refactor callfunc and callsub out of if statements
Diffstat (limited to 'world/map/npc/009-1/jack.txt')
| -rw-r--r-- | world/map/npc/009-1/jack.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt index 65968d5e..f92813db 100644 --- a/world/map/npc/009-1/jack.txt +++ b/world/map/npc/009-1/jack.txt @@ -39,8 +39,11 @@ mes "[Jack Lumber]"; mes "\"Hello there, my name is Jack Lumber, the enemy of all trees. If you need some firewood just let me know.\""; - if (@inspector == 1) - callsub S_NohMask_Ask; + if (@inspector != 1) + goto L_NotInspector; + callsub S_NohMask_Ask; + +L_NotInspector: next; if (@Q_Forestbow < 1) goto L_Close; @@ -96,8 +99,9 @@ L_Bow_state_2: if (@Q_Forestbow > 3) goto L_Bow_state_4; mes "\"Good luck hunting those tree monsters - you will need it.\""; - if (@inspector == 1) - callsub S_NohMask_Ask; + if (@inspector != 1) + goto L_Close; + callsub S_NohMask_Ask; goto L_Close; L_Bow_state_4: |