From ef740ac0479a5a4f4240db63b84531599a26a983 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Thu, 24 Mar 2011 20:24:47 -0700
Subject: Fix timer bugs in previous version The most visible effect of this
 was that the map-server would never actually connect with the char-server

---
 src/map/map.c | 1 -
 src/map/npc.c | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/map')

diff --git a/src/map/map.c b/src/map/map.c
index 8261e49..7730b94 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -2113,7 +2113,6 @@ void do_final (void)
         delete_session (i);
 
     map_removenpc ();
-    timer_final ();
 
     numdb_final (id_db, NULL);
     strdb_final (map_db, NULL);
diff --git a/src/map/npc.c b/src/map/npc.c
index 54b13d8..85ac6e9 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2236,6 +2236,8 @@ int do_final_npc (void)
 
     if (ev_db)
         strdb_final (ev_db, ev_db_final);
+    if (npcname_db)
+        strdb_final (npcname_db, NULL);
 
     for (i = START_NPC_NUM; i < npc_id; i++)
     {
-- 
cgit v1.2.3-70-g09d2