diff options
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/resources/action.cpp | 11 |
2 files changed, 4 insertions, 8 deletions
@@ -21,6 +21,7 @@ * src/gui/quitdialog.cpp: Plugged memory leak in quit dialog. * src/resources/iteminfo.cpp, src/resources/iteminfo.h: Plugged memory leak in equipment sound. + * src/resources/action.cpp: Fixed double-free of sprite actions. 2007-10-20 Guillaume Melquiond <guillaume.melquiond@gmail.com> diff --git a/src/resources/action.cpp b/src/resources/action.cpp index 247455db..6b3c2f52 100644 --- a/src/resources/action.cpp +++ b/src/resources/action.cpp @@ -45,10 +45,11 @@ Action::getAnimation(int direction) const { Animations::const_iterator i = mAnimations.find(direction); - // When the direction isn't defined, try the default + // When the given direction is not available, return the first one. + // (either DEFAULT, or more usually DOWN). if (i == mAnimations.end()) { - i = mAnimations.find(0); + i = mAnimations.begin(); } return (i == mAnimations.end()) ? NULL : i->second; @@ -57,11 +58,5 @@ Action::getAnimation(int direction) const void Action::setAnimation(int direction, Animation *animation) { - // Set first direction as default direction - if (mAnimations.empty()) - { - mAnimations[0] = animation; - } - mAnimations[direction] = animation; } |