summaryrefslogtreecommitdiff
path: root/src/resources/action.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-08 20:58:10 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-12-08 21:22:43 +0100
commit68760426532b9ca4c6939d7a7b8faa1586ee82e0 (patch)
tree891f475717294eef4c68af4bb830f35744643075 /src/resources/action.cpp
parentddc93c461070fb3d868fbb5426e8361d1b93ee38 (diff)
downloadmana-68760426532b9ca4c6939d7a7b8faa1586ee82e0.tar.gz
mana-68760426532b9ca4c6939d7a7b8faa1586ee82e0.tar.bz2
mana-68760426532b9ca4c6939d7a7b8faa1586ee82e0.tar.xz
mana-68760426532b9ca4c6939d7a7b8faa1586ee82e0.zip
Code reformatting
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
Diffstat (limited to 'src/resources/action.cpp')
-rw-r--r--src/resources/action.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index ffbbffb2..bbea45c9 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -21,8 +21,6 @@
#include "action.h"
-#include <algorithm>
-
#include "animation.h"
#include "../utils/dtor.h"
@@ -34,12 +32,10 @@ Action::Action()
Action::~Action()
{
- std::for_each(mAnimations.begin(), mAnimations.end(),
- make_dtor(mAnimations));
+ delete_all(mAnimations);
}
-Animation*
-Action::getAnimation(int direction) const
+Animation *Action::getAnimation(int direction) const
{
Animations::const_iterator i = mAnimations.find(direction);
@@ -53,8 +49,7 @@ Action::getAnimation(int direction) const
return (i == mAnimations.end()) ? NULL : i->second;
}
-void
-Action::setAnimation(int direction, Animation *animation)
+void Action::setAnimation(int direction, Animation *animation)
{
mAnimations[direction] = animation;
}