Clear (most) new warnings

1 files changed, 5 insertions, 10 deletions

diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 48c9a26b..1cafe780 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -40,9 +40,9 @@
 
     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)
-        goto L_NotInspector;
-    callsub S_NohMask_Ask;
+    if (@inspector == 1)
+        goto L_NohMask_Ask;
+    goto L_NotInspector;
 
 L_NotInspector:
     next;
@@ -120,8 +120,7 @@ L_Bow_state_2:
     mes "\"Good luck hunting those tree monsters - you will need it.\"";
     if (@inspector != 1)
         goto L_Close;
-    callsub S_NohMask_Ask;
-    goto L_Close;
+    goto L_NohMask_Ask;
 
 L_Bow_state_4:
     mes "[Jack Lumber]";
@@ -247,14 +246,10 @@ L_Shield_state_3:
         "Me too.", L_Made_Shield,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
 
-// This is an ugly violation of the scripting standards,
-// but it's somewhat complicated to fix.
-S_NohMask_Ask:
-    next;
+L_NohMask_Ask:
     menu
         "I'll keep that in mind.", L_Close,
         "Have you seen anything that might be connected to the recent robberies in town?", L_NohMask_Answer;
-    return;
 
 L_NohMask_Answer:
     mes "[Jack Lumber]";