diff engine/core/video/animation.h @ 378:64738befdf3b

bringing in the changes from the build_system_rework branch in preparation for the 0.3.0 release. This commit will require the Jan2010 devkit. Clients will also need to be modified to the new way to import fife.
author vtchill@33b003aa-7bff-0310-803a-e67f0ece8222
date Mon, 11 Jan 2010 23:34:52 +0000
parents 3804348fe3fb
children
line wrap: on
line diff
--- a/engine/core/video/animation.h	Wed Dec 09 17:01:52 2009 +0000
+++ b/engine/core/video/animation.h	Mon Jan 11 23:34:52 2010 +0000
@@ -88,7 +88,7 @@
 		/** Gets the frame duration for given (indexed) frame. Returns negative value in case
 		 * of incorrect index
 		 */
-		int getFrameDuration(int index);
+		int getFrameDuration(int index) const;
 
 		/** Get the number of frames
 		 */
@@ -105,7 +105,7 @@
 		/** Gets the action frame.
 		 * @see setActionFrame
 		 */
-		int getActionFrame() { return m_action_frame; }
+		int getActionFrame() const { return m_action_frame; }
 
 		/** Animation direction tells how this animation is associated
 		 * with movement when played starting from frame 0
@@ -120,11 +120,11 @@
 		 * @see setDirection
 		 * @return direction for this animation
 		 */
-		unsigned int getDirection() { return m_direction; }
+		unsigned int getDirection() const { return m_direction; }
 
 		/** Gets the total duration for the whole animation
 		 */
-		int getDuration() { return m_animation_endtime; }
+		unsigned int getDuration() const { return m_animation_endtime; }
 
 	private:
 		/** Contains information about one animation frame (duration + frame index + frame pointer)
@@ -137,7 +137,7 @@
 
 		/** Checks for animation frame index overflows
 		 */
-		bool isValidIndex(int index);
+		bool isValidIndex(int index) const;
 
 		// Map of timestamp + associated frame
 		std::map<unsigned int, FrameInfo> m_framemap;