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/being.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/being.cpp')

diff --git a/src/being.cpp b/src/being.cpp
index 1b95b17d..138e5c5a 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -153,7 +153,7 @@ void Being::setSubtype(Uint16 subtype)
         int id = -100 - subtype;
 
         // Prevent showing errors when sprite doesn't exist
-        if (!ItemDB::exists(id))
+        if (!itemDb->exists(id))
             id = -100;
 
         setSprite(Net::getCharHandler()->baseSprite(), id);
@@ -1106,7 +1106,7 @@ void Being::setSprite(unsigned int slot, int id, const std::string &color,
     }
     else
     {
-        std::string filename = ItemDB::get(id).getSprite(mGender);
+        std::string filename = itemDb->get(id).getSprite(mGender);
         AnimatedSprite *equipmentSprite = NULL;
 
         if (!filename.empty())
@@ -1124,7 +1124,7 @@ void Being::setSprite(unsigned int slot, int id, const std::string &color,
         CompoundSprite::setSprite(slot, equipmentSprite);
 
         if (isWeapon)
-            mEquippedWeapon = &ItemDB::get(id);
+            mEquippedWeapon = &itemDb->get(id);
 
         setAction(mAction);
     }
@@ -1154,7 +1154,7 @@ void Being::load()
     // we can go.
     int hairstyles = 1;
 
-    while (ItemDB::get(-hairstyles).getSprite(GENDER_MALE) !=
+    while (itemDb->get(-hairstyles).getSprite(GENDER_MALE) !=
                                         paths.getStringValue("spriteErrorFile"))
         hairstyles++;
 
-- 
cgit v1.2.3-70-g09d2