summaryrefslogtreecommitdiff
path: root/src/resources/action.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:42:53 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-03-27 01:43:55 +0100
commit1715d0afe44a282a356ca88e47c92ec556f094dd (patch)
tree36dcaa69dcf0165c33d7da1c1cc1a9f5fb7e228f /src/resources/action.cpp
parent511d9ac780e094767e806c9a448ac973279dd4c8 (diff)
downloadmana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.gz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.bz2
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.tar.xz
mana-1715d0afe44a282a356ca88e47c92ec556f094dd.zip
Fixed include structure in resource/ directory
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
Diffstat (limited to 'src/resources/action.cpp')
-rw-r--r--src/resources/action.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/resources/action.cpp b/src/resources/action.cpp
index e2cb11f2..7bd7c54f 100644
--- a/src/resources/action.cpp
+++ b/src/resources/action.cpp
@@ -19,10 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "action.h"
-#include "animation.h"
+#include "resources/action.h"
-#include "../utils/dtor.h"
+#include "resources/animation.h"
+
+#include "utils/dtor.h"
Action::Action()
{
@@ -40,9 +41,7 @@ Animation *Action::getAnimation(int direction) const
// When the given direction is not available, return the first one.
// (either DEFAULT, or more usually DOWN).
if (i == mAnimations.end())
- {
i = mAnimations.begin();
- }
return (i == mAnimations.end()) ? NULL : i->second;
}