From 414b37aedff74320b0c991a113e752fa3e014bd7 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Wed, 13 May 2015 10:30:14 -0400
Subject: a few fixes/modifications here and there

---
 world/map/npc/functions/banker.txt             |  2 +-
 world/map/npc/functions/debug.txt              |  2 +-
 world/map/npc/functions/default_npc_checks.txt |  5 ++---
 world/map/npc/functions/ferry.txt              |  2 ++
 world/map/npc/functions/mob_points.txt         | 11 ++++-------
 5 files changed, 10 insertions(+), 12 deletions(-)

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

diff --git a/world/map/npc/functions/banker.txt b/world/map/npc/functions/banker.txt
index 2caa2ad0..5650c5ed 100644
--- a/world/map/npc/functions/banker.txt
+++ b/world/map/npc/functions/banker.txt
@@ -25,7 +25,7 @@ L_Start:
 L_Storage:
     if (#BankOptions & OPT_STORAGE_CLOSE) close2;
     openstorage;
-    if (#BankOptions & OPT_STORAGE_CLOSE) end;
+    if (#BankOptions & OPT_STORAGE_CLOSE) goto L_Return;
     goto L_Start;
 
 L_Dep:
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index f20d27b8..44af4d40 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -7,7 +7,7 @@ function|script|Debug
     mes "";
     mes "%%E        ##a"+ getspellinvocation("debug0") +"##0";
     set @debug_npc, 0;
-    close;
+    goto L_Close;
 
 L_Begin:
     set @debug_mask, 65535;
diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt
index d20ed187..c714c931 100644
--- a/world/map/npc/functions/default_npc_checks.txt
+++ b/world/map/npc/functions/default_npc_checks.txt
@@ -21,13 +21,12 @@ function|script|PCtoNPCRange
     if(@distance_handler) goto L_Return;
     set @dnpc_name$, strnpcinfo(1);
     if(@dnpc_name$ != "") goto L_Named;
-    mes "You need to move closer to interact with this npc.";
-    close2;
+    message strcharinfo(0), "##3Server : ##BYou need to move closer to interact with this npc.";
     goto L_Return;
 
 L_Named:
     message strcharinfo(0), "##3"+@dnpc_name$+" : ##BPlease move closer.";
-    end;
+    goto L_Return;
 
 L_Return:
     set @dnpc_name$, "";
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 9d1a9ba8..eb7196d1 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -135,6 +135,7 @@ function|script|BoardFerry
         "No.", L_Return;
 
 L_Board:
+    close2;
     warp "035-2",39,29;
     goto L_Return;
 
@@ -150,6 +151,7 @@ function|script|BoardCandorFerry
         "No.", L_Return;
 
 L_Board:
+    close2;
     warp "036-2",39,29;
     goto L_Return;
 
diff --git a/world/map/npc/functions/mob_points.txt b/world/map/npc/functions/mob_points.txt
index ba2910b1..d60c68b6 100644
--- a/world/map/npc/functions/mob_points.txt
+++ b/world/map/npc/functions/mob_points.txt
@@ -184,20 +184,17 @@ L_NatureKarma:
         set @value, 3;
 
     if (@value == 0)
-        goto L_end;
+        goto L_Return;
 
     callfunc "QuestSagathaAnnoy";
-    goto L_end;
+    goto L_Return;
 
 L_good:
     set @value, 1;
     callfunc "QuestSagathaHappy";
-    goto L_end;
-
-L_end:
-    set @value, 0;
-    end;
+    goto L_Return;
 
 L_Return:
+    set @value, 0;
     return;
 }
-- 
cgit v1.2.3-60-g2f50