diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-10-16 20:18:50 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-10-16 20:18:50 +0000 |
| commit | 7489419558c12ba19eb7d0f26bf5a29149330eb0 (patch) | |
| tree | 769035b8e79b95a2767aa04daa5cb567492e1254 /src/being.cpp | |
| parent | 4453a80a2f43c5ebf20dce881586a89c484d4830 (diff) | |
| download | mana-client-7489419558c12ba19eb7d0f26bf5a29149330eb0.tar.gz mana-client-7489419558c12ba19eb7d0f26bf5a29149330eb0.tar.bz2 mana-client-7489419558c12ba19eb7d0f26bf5a29149330eb0.tar.xz mana-client-7489419558c12ba19eb7d0f26bf5a29149330eb0.zip | |
Use the ResourceManager to get spritesets.
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/being.cpp b/src/being.cpp index fdfc5c8c..42b2c2f5 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -39,7 +39,6 @@ #include "net/protocol.h" #include "resources/resourcemanager.h" -#include "resources/image.h" extern Being* autoTarget; extern std::map<int, Spriteset*> monsterset; @@ -108,14 +107,12 @@ Being* createBeing(Uint32 id, Uint16 job, Map *map) filename << "graphics/sprites/monster" << (being->job - 1002) << ".png"; logger->log("%s",filename.str().c_str()); - Image *monsterbitmap = - ResourceManager::getInstance()->getImage(filename.str()); - - if (!monsterbitmap) { - logger->error("Unable to load monster.png"); + Spriteset *tmp = ResourceManager::getInstance()->createSpriteset( + filename.str(), 60, 60); + if (!tmp) { + logger->error("Unable to load monster spriteset!"); } else { - monsterset[being->job - 1002] = new Spriteset(monsterbitmap, 60, 60); - monsterbitmap->decRef(); + monsterset[being->job - 1002] = tmp; } } |