From 39a260d10d9fe9ed575602eb45a30c347270e405 Mon Sep 17 00:00:00 2001
From: XTZGZoReX <none@none>
Date: Fri, 29 Jan 2010 11:56:48 +0100
Subject: * Added actual loading of the `addons` table... This was missing in
 the original commit.

--HG--
branch : trunk
---
 src/game/AddonMgr.cpp | 6 ++----
 src/game/World.cpp    | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game/AddonMgr.cpp b/src/game/AddonMgr.cpp
index 9116f504a1d..afa92c49020 100644
--- a/src/game/AddonMgr.cpp
+++ b/src/game/AddonMgr.cpp
@@ -49,9 +49,7 @@ void AddonMgr::LoadFromDB()
         return;
     }
 
-    uint32 total_records = result->GetRowCount();
-
-    barGoLink bar(total_records);
+    barGoLink bar(result->GetRowCount());
     uint32 count = 0;
     Field *fields;
 
@@ -61,7 +59,7 @@ void AddonMgr::LoadFromDB()
         bar.step();
         count++;
 
-        std::string name = fields[0].GetString();
+        std::string name = fields[0].GetCppString();
         uint32 crc = fields[1].GetUInt32();
 
         SavedAddon addon(name, crc);
diff --git a/src/game/World.cpp b/src/game/World.cpp
index a9a0c9426eb..f8590ce8784 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1549,6 +1549,9 @@ void World::SetInitialWorldSettings()
     sLog.outString("Loading GM tickets...");
     objmgr.LoadGMTickets();
 
+    sLog.outString("Loading client addons...");
+    sAddonMgr.LoadFromDB();
+
     ///- Handle outdated emails (delete/return)
     sLog.outString("Returning old mails...");
     objmgr.ReturnOrDeleteOldMails(false);
-- 
cgit v1.2.3