fixed coalesce

2 files changed, 13 insertions, 14 deletions

diff --git a/include/common.hpp b/include/common.hpp
index 7b98ea9..3caa083 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -58,11 +58,7 @@ typedef unsigned int uint;
 
 #define BREAKPOINT __asm__("int $3")
 
-template<typename T>
-inline const T * const& coalesce(const void * &p1, const void * &p2)
-{
-	return ((p1 == nullptr) ? reinterpret_cast<T*>(p2) : p1);
-}
+#define coalesce(v1, v2) ((v1 != nullptr) ? v1 : v2)
 
 /**
  * Creates a coordinate of integers.
diff --git a/include/components.hpp b/include/components.hpp
index 4f8ef56..d630f83 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -216,21 +216,24 @@ struct Animate {
 	// COMMENT
 	std::vector<Frame> frame;
 	// COMMENT	
-	std::vector<Frame>::iterator currentFrame;
+	uint index;
 
 	Animate(){
-		currentFrame = std::begin(frame);
+		index = 0;
 	}
 
 	// COMMENT
 	Frame nextFrame() {
-		std::rotate(frame.begin(), frame.begin()+1, frame.end());
-		return frame[0];
-		/*if (currentFrame < std::end(frame))
-			return (*currentFrame++);
-		else
-			currentFrame = std::begin(frame);
-		return (*currentFrame);*/
+		if (index < frame.size() - 1) {
+			index++;
+		} else {
+			index = 0;
+		}
+		return frame.at(index);
+	}
+
+	Frame firstFrame() {
+		return frame.front();
 	}
 };