diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-08-26 16:55:05 +0200 |
| commit | 6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d (patch) | |
| tree | 4e6e178095ac8cf89dc0dba4f532913891305436 /src/being.cpp | |
| parent | ee8f131b49bb9b1d66cac3840b3c566eb49bcf3f (diff) | |
| download | mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.gz mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.bz2 mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.tar.xz mana-6d9dbf93e6c0247cb9b19d3f52a1837a5833b22d.zip | |
Merged testing branch into master.
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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++; |