From b9fdb4fd361fbc0c8e2c0df9615e6eed540917a1 Mon Sep 17 00:00:00 2001
From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 12 Aug 2012 00:04:36 +0200
Subject: [PATCH] renamed Animation to SimpleAnimation

---
 src/battle/BattleState.h                        |  8 ++++----
 src/battle/states/PerformAttacks.cpp            | 12 ++++++------
 src/graphics/{Animation.h => SimpleAnimation.h} | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)
 rename src/graphics/{Animation.h => SimpleAnimation.h} (81%)

diff --git a/src/battle/BattleState.h b/src/battle/BattleState.h
index 736e2c1..77e2b5d 100644
--- a/src/battle/BattleState.h
+++ b/src/battle/BattleState.h
@@ -19,8 +19,8 @@
 #include "../app/State.h"
 #include "../geometry/Point.h"
 #include "../geometry/Vector.h"
-#include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
+#include "../graphics/SimpleAnimation.h"
 
 #include <vector>
 #include <SDL.h>
@@ -97,8 +97,8 @@ public:
 	Monster &MonsterAt(int index) { return monsters[index]; }
 	const Monster &MonsterAt(int index) const { return monsters[index]; }
 
-	graphics::Animation &HeroAnimationAt(int index) { return heroAnimations[index]; }
-	const graphics::Animation &HeroAnimationAt(int index) const { return heroAnimations[index]; }
+	graphics::SimpleAnimation &HeroAnimationAt(int index) { return heroAnimations[index]; }
+	const graphics::SimpleAnimation &HeroAnimationAt(int index) const { return heroAnimations[index]; }
 
 	const HeroTag &HeroTagAt(int index) const { return heroTags[index]; }
 	const geometry::Point<int> &HeroTagPositionAt(int index) const { return heroTagPositions[index]; }
@@ -153,7 +153,7 @@ private:
 	std::vector<geometry::Point<int> > heroesPositions;
 	std::vector<Monster> monsters;
 	Hero heroes[4];
-	graphics::Animation heroAnimations[4];
+	graphics::SimpleAnimation heroAnimations[4];
 	graphics::Menu<const common::Spell *> spellMenus[4];
 	graphics::Menu<const common::Item *> itemMenu;
 	graphics::Menu<const common::Item *> ikariMenus[4];
diff --git a/src/battle/states/PerformAttacks.cpp b/src/battle/states/PerformAttacks.cpp
index 09366d4..c34e114 100644
--- a/src/battle/states/PerformAttacks.cpp
+++ b/src/battle/states/PerformAttacks.cpp
@@ -17,9 +17,9 @@
 #include "../../common/Spell.h"
 #include "../../geometry/operators.h"
 #include "../../geometry/Point.h"
-#include "../../graphics/Animation.h"
 #include "../../graphics/Font.h"
 #include "../../graphics/Frame.h"
+#include "../../graphics/SimpleAnimation.h"
 
 #include <cstring>
 
@@ -27,7 +27,7 @@ using app::Application;
 using app::Input;
 using geometry::Point;
 using geometry::Vector;
-using graphics::Animation;
+using graphics::SimpleAnimation;
 
 namespace battle {
 
@@ -80,13 +80,13 @@ void PerformAttacks::HandleEvents(const Input &input) {
 
 				switch (ac.GetType()) {
 					case AttackChoice::SWORD:
-						battle->HeroAnimationAt(cursor) = Animation(
+						battle->HeroAnimationAt(cursor) = SimpleAnimation(
 								battle->HeroAt(cursor).Sprite(),
 								battle->HeroAt(cursor).AttackFrameTime(),
 								battle->HeroAt(cursor).AttackFrames(), 2);
 						break;
 					case AttackChoice::MAGIC:
-						battle->HeroAnimationAt(cursor) = Animation(
+						battle->HeroAnimationAt(cursor) = SimpleAnimation(
 								battle->HeroAt(cursor).Sprite(),
 								battle->HeroAt(cursor).SpellFrameTime(),
 								battle->HeroAt(cursor).SpellFrames(), 3);
@@ -96,12 +96,12 @@ void PerformAttacks::HandleEvents(const Input &input) {
 					case AttackChoice::IKARI:
 						if (ac.GetItem()->HasIkari()) {
 							if (ac.GetItem()->GetIkari()->IsMagical()) {
-								battle->HeroAnimationAt(cursor) = Animation(
+								battle->HeroAnimationAt(cursor) = SimpleAnimation(
 										battle->HeroAt(cursor).Sprite(),
 										battle->HeroAt(cursor).SpellFrameTime(),
 										battle->HeroAt(cursor).SpellFrames(), 3);
 							} else {
-								battle->HeroAnimationAt(cursor) = Animation(
+								battle->HeroAnimationAt(cursor) = SimpleAnimation(
 										battle->HeroAt(cursor).Sprite(),
 										battle->HeroAt(cursor).AttackFrameTime(),
 										battle->HeroAt(cursor).AttackFrames(), 2);
diff --git a/src/graphics/Animation.h b/src/graphics/SimpleAnimation.h
similarity index 81%
rename from src/graphics/Animation.h
rename to src/graphics/SimpleAnimation.h
index 146184c..dffd863 100644
--- a/src/graphics/Animation.h
+++ b/src/graphics/SimpleAnimation.h
@@ -1,12 +1,12 @@
 /*
- * Animation.h
+ *  SimpleAnimation.h
  *
  *  Created on: Aug 11, 2012
  *      Author: holy
  */
 
-#ifndef GRAPHICS_ANIMATION_H_
-#define GRAPHICS_ANIMATION_H_
+#ifndef GRAPHICS_SIMPLEANIMATION_H_
+#define GRAPHICS_SIMPLEANIMATION_H_
 
 #include "Sprite.h"
 #include "../app/Application.h"
@@ -18,12 +18,12 @@
 
 namespace graphics {
 
-class Animation {
+class SimpleAnimation {
 
 public:
-	Animation()
+	SimpleAnimation()
 	: sprite(0), frameTime(0), numFrames(0), col(0), row(0), repeat(false) { }
-	Animation(const Sprite *sprite, int frameTime, int numFrames, int col = 0, int row = 0, bool repeat = false)
+	SimpleAnimation(const Sprite *sprite, int frameTime, int numFrames, int col = 0, int row = 0, bool repeat = false)
 	: sprite(sprite), frameTime(frameTime), numFrames(numFrames), col(col), row(row), repeat(repeat) { }
 
 public:
@@ -59,4 +59,4 @@ private:
 
 }
 
-#endif /* GRAPHICS_ANIMATION_H_ */
+#endif /* GRAPHICS_SIMPLEANIMATION_H_ */
-- 
2.39.2