diff options
Diffstat (limited to 'world/map/npc/functions')
| -rw-r--r-- | world/map/npc/functions/dailyquest.txt | 5 | ||||
| -rw-r--r-- | world/map/npc/functions/game_rules.txt | 5 | ||||
| -rw-r--r-- | world/map/npc/functions/mob_points.txt | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 9b9d626e..aadafc89 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -119,7 +119,7 @@ L_Exit: S_SayPhrase: if (@dq_handle_return) - return; + goto L_Return; if (DailyQuestPoints < @dq_cost) goto L_Exhausted; if (DailyQuestPoints > BaseLevel) @@ -150,4 +150,7 @@ L_Low: L_Exhausted: mes "\"You look exhausted, maybe you should rest a bit.\""; return; + +L_Return: + return; } diff --git a/world/map/npc/functions/game_rules.txt b/world/map/npc/functions/game_rules.txt index caf13cb1..1d9bd91d 100644 --- a/world/map/npc/functions/game_rules.txt +++ b/world/map/npc/functions/game_rules.txt @@ -14,7 +14,8 @@ function|script|GameRules|, "Portugues (Portuguese)", L_Portuguese, "Polski (Polish)", L_Polish, "Italiano (Italian)", L_Italian; - if (@canSkip) return; + // is this even reachable? TODO look at how the 'cancel' button works. + if (@canSkip) goto L_Return; L_English: mes "Players breaking the following rules may be banned (up to and including a permanent ban) or have their characters reset at the GM's discretion:"; @@ -159,5 +160,7 @@ L_End: set @read, 1; if (TUT_var == 0) set TUT_var, gettimetick(2); + +L_Return: return; } diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt index 0bdcec06..5f711afb 100644 --- a/world/map/npc/functions/mob_points.txt +++ b/world/map/npc/functions/mob_points.txt @@ -2,7 +2,7 @@ function|script|MobPoints|, { - if (@mobID < 1002) return; + if (@mobID < 1002) goto L_Return; setarray @points, 1, // Maggot @@ -159,4 +159,8 @@ L_good: L_end: set @value, 0; + end; + +L_Return: + return; } |