Fix other bugs detected

3 files changed, 10 insertions, 8 deletions

diff --git a/npc/024-14/doorbell.txt b/npc/024-14/doorbell.txt
index f60d9cea7..d40aef1f1 100644
--- a/npc/024-14/doorbell.txt
+++ b/npc/024-14/doorbell.txt
@@ -51,7 +51,8 @@ L_Manage:
     next;
     select
         l("Leave"),
-        l("Manage Furniture");
+        l("Manage Furniture"),
+        l("Reload NPC Data");
 
     switch (@menu) {
         case 1:
@@ -60,6 +61,10 @@ L_Manage:
         case 2:
             goto L_Furniture;
             break;
+        case 3:
+            addtimer2(150, "NPCs#RES_PPL::OnReload");
+            close;
+            break;
     }
     goto L_Manage;
 
diff --git a/npc/024-14/utils.txt b/npc/024-14/utils.txt
index e9c8853bb..4e58f8b7e 100644
--- a/npc/024-14/utils.txt
+++ b/npc/024-14/utils.txt
@@ -33,9 +33,6 @@
     end;
 
 OnInit:
-    // Estate Settings
-    .mapa$="024-14"; // Map name
-
     // NPC Settings
     .sex = G_OTHER;
     .distance = 3;
@@ -45,9 +42,9 @@ OnInit:
 OnReload:
     //debugmes "[REAL ESTATE] NPC ONRELOAD";
     // load_npc ( name , map, x , y{, cell} )
-    load_npc("Wardrobe#RES_PPL", .mapa$, 25, 26);
-    load_npc("Cauldron#RES_PPL", .mapa$, 28, 27);
-    load_npc("Piano#RES_PPL"   , .mapa$, 32, 26);
+    load_npc("Wardrobe#RES_PPL", "ples@"+getcharid(0), 25, 26);
+    load_npc("Cauldron#RES_PPL", "ples@"+getcharid(0), 28, 27);
+    load_npc("Piano#RES_PPL"   , "ples@"+getcharid(0), 32, 26);
     end;
 
 }
diff --git a/npc/functions/timer.txt b/npc/functions/timer.txt
index 5d7466d0f..cd1684b94 100644
--- a/npc/functions/timer.txt
+++ b/npc/functions/timer.txt
@@ -33,7 +33,7 @@ function	script	areatimer2	{
 function	script	addtimer2	{
     deltimer(getarg(1));
     addtimer(getarg(0), getarg(1));
-    return .@i;
+    return;
 }