From 6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Thu, 26 Aug 2010 16:55:05 +0200
Subject: Merged testing branch into master.

---
 src/client.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/client.cpp')

diff --git a/src/client.cpp b/src/client.cpp
index 1e1d17a9..6ed208c0 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -120,6 +120,8 @@ KeyboardConfig keyboard;
 UserPalette *userPalette;
 Graphics *graphics;
 
+ItemDB *itemDb;
+
 Sound sound;
 
 void ErrorListener::action(const gcn::ActionEvent &)
@@ -438,7 +440,7 @@ Client::~Client()
     // Unload XML databases
     ColorDB::unload();
     EmoteDB::unload();
-    ItemDB::unload();
+    delete itemDb;
     MonsterDB::unload();
     NPCDB::unload();
     StatusEffect::unload();
@@ -747,7 +749,7 @@ int Client::exec()
 
                     // Load XML databases
                     ColorDB::load();
-                    ItemDB::load();
+                    itemDb = new ItemDB;
                     Being::load(); // Hairstyles
                     MonsterDB::load();
                     SpecialDB::load();
-- 
cgit v1.2.3-70-g09d2