From c0ba38cd4b68491e28e467889804ebc09c9c002e Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Wed, 2 Apr 2014 11:06:32 -0700
Subject: Clean up main scripts

---
 world/map/npc/items/launcher_ammo.txt       | 1 +
 world/map/npc/items/purification_potion.txt | 1 +
 world/map/npc/items/require_stat.txt        | 1 +
 world/map/npc/items/restricted_item.txt     | 1 +
 world/map/npc/items/unequipcb.txt           | 2 ++
 world/map/npc/items/unreleased_item.txt     | 1 +
 6 files changed, 7 insertions(+)

(limited to 'world/map/npc/items')

diff --git a/world/map/npc/items/launcher_ammo.txt b/world/map/npc/items/launcher_ammo.txt
index 79cf057b..25f4df9b 100644
--- a/world/map/npc/items/launcher_ammo.txt
+++ b/world/map/npc/items/launcher_ammo.txt
@@ -24,6 +24,7 @@ function|script|CheckAmmo|,
         goto L_Return;
 
     callfunc "UnequipLater";
+    goto L_Return;
 
 L_Return:
     set @LauncherType, 0;
diff --git a/world/map/npc/items/purification_potion.txt b/world/map/npc/items/purification_potion.txt
index 2a8c47d3..9ff5494c 100644
--- a/world/map/npc/items/purification_potion.txt
+++ b/world/map/npc/items/purification_potion.txt
@@ -4,6 +4,7 @@ function|script|usePurificationPotion|,
 {
     if (isat("011-1.gat", 88,67))
         goto L_Wyara_Pond;
+    goto L_NoUse;
 
 L_NoUse:
     message strcharinfo(0), "You don't know what to do with this.";
diff --git a/world/map/npc/items/require_stat.txt b/world/map/npc/items/require_stat.txt
index 8629b686..f9734a1c 100644
--- a/world/map/npc/items/require_stat.txt
+++ b/world/map/npc/items/require_stat.txt
@@ -19,6 +19,7 @@ function|script|RequireStat|,
 
 L_Unequip:
     callfunc "UnequipLater";
+    goto L_Return;
 
 L_Return:
     return;
diff --git a/world/map/npc/items/restricted_item.txt b/world/map/npc/items/restricted_item.txt
index 7e3213c0..5873ce45 100644
--- a/world/map/npc/items/restricted_item.txt
+++ b/world/map/npc/items/restricted_item.txt
@@ -15,6 +15,7 @@ function|script|RestrictedItem|,
     if (getgmlevel()) goto L_Return;
     gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
     gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
+    goto L_Return;
 
 L_Return:
     return;
diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt
index 62dc7715..10080990 100644
--- a/world/map/npc/items/unequipcb.txt
+++ b/world/map/npc/items/unequipcb.txt
@@ -4,6 +4,7 @@
 // during the intial connection's equip hook
 botcheck.gat,0,0,0|script|UnequipCB|-1,-1,-1
 {
+    end;
 
 OnUnequip:
     unequipbyid (@unequip_slot - 1);
@@ -21,6 +22,7 @@ function|script|UnequipLater|,
 
     set @unequip_slot, (@slotId + 1);
     addtimer 0, "UnequipCB::OnUnequip";
+    goto L_Return;
 
 L_Return:
     return;
diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt
index 457c2bcb..68fbc468 100644
--- a/world/map/npc/items/unreleased_item.txt
+++ b/world/map/npc/items/unreleased_item.txt
@@ -10,6 +10,7 @@ function|script|UnreleasedItem|,
         goto L_Return;
     message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world.";
     callfunc "UnequipLater";
+    goto L_Return;
 
 L_Return:
     return;
-- 
cgit v1.2.3-60-g2f50