summaryrefslogtreecommitdiff
path: root/src/being.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-24 00:13:24 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-07-24 00:13:24 +0000
commit4789ebb11407eb9402c385f3cc6fa242d91214c2 (patch)
tree6bf5bed52073ae19ef4b5b08e7fe92af603f04d8 /src/being.cpp
parent1b7ff9ad4160fd0ff79d2da658eca8d8c8abf815 (diff)
downloadmana-client-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.gz
mana-client-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.bz2
mana-client-4789ebb11407eb9402c385f3cc6fa242d91214c2.tar.xz
mana-client-4789ebb11407eb9402c385f3cc6fa242d91214c2.zip
Implemented caching of spritesets, including a lot of cleanups to the new
animation system. Action now refers to the Spriteset directly and AnimatedSprite refers to the current Action directly instead of using the std::map with a std::string constantly. Some methods and parameters are marked as const. The READ_PROP macro was replaced by static methods. Warnings are logged when unnamed actions are defined or when actions refer to undefined imagesets. Code is more tolerant towards missing actions.
Diffstat (limited to 'src/being.cpp')
-rw-r--r--src/being.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/being.cpp b/src/being.cpp
index d34ea43e..437023d4 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -28,7 +28,7 @@
#include "log.h"
#include "map.h"
-#include "graphic/spriteset.h"
+#include "resources/spriteset.h"
#include "gui/gui.h"
@@ -65,9 +65,12 @@ Being::Being(Uint32 id, Uint16 job, Map *map):
Being::~Being()
{
- for (int i =0; i < VECTOREND_SPRITE; i++)
+ for (int i = 0; i < VECTOREND_SPRITE; i++)
{
- delete mSprites[i];
+ if (mSprites[i] != NULL)
+ {
+ delete mSprites[i];
+ }
}
clearPath();
@@ -266,7 +269,6 @@ Being::setDirection(Uint8 direction)
{
if (mSprites[i] != NULL) mSprites[i]->setDirection(dir);
}
-
}
void