Make GetSpriteFrame take uint frame number.

Author: janisozaur

Source/Entities/MOSprite.h

@@ -89,7 +89,7 @@ namespace RTE {
 		/// @param whichFrame Which frame to get. (default: 0)
 		/// @return A pointer to the requested frame of this MOSprite's BITMAP array.
 		/// Ownership is NOT transferred!
-		BITMAP* GetSpriteFrame(int whichFrame = 0) const { return (whichFrame >= 0 && whichFrame < m_FrameCount) ? m_aSprite[whichFrame] : 0; }
+		BITMAP* GetSpriteFrame(unsigned int whichFrame = 0) const { return (whichFrame < m_FrameCount) ? m_aSprite[whichFrame] : 0; }
 
 		/// Gets the width of the bitmap of this MOSprite
 		/// @return Sprite width if loaded.

Source/Lua/LuaBindingsManagers.cpp

@@ -243,10 +243,10 @@ namespace RTE {
 		    .def("DrawTextPrimitive", (void(PrimitiveMan::*)(const Vector& start, const std::string& text, bool isSmall, int alignment, float rotAngle)) & PrimitiveMan::DrawTextPrimitive)
 		    .def("DrawTextPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const std::string& text, bool isSmall, int alignment)) & PrimitiveMan::DrawTextPrimitive)
 		    .def("DrawTextPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const std::string& text, bool isSmall, int alignment, float rotAngle)) & PrimitiveMan::DrawTextPrimitive)
-		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const MOSprite* moSprite, float rotAngle, int frame)) & PrimitiveMan::DrawBitmapPrimitive)
-		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped)) & PrimitiveMan::DrawBitmapPrimitive)
-		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const MOSprite* moSprite, float rotAngle, int frame)) & PrimitiveMan::DrawBitmapPrimitive)
-		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped)) & PrimitiveMan::DrawBitmapPrimitive)
+		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const MOSprite* moSprite, float rotAngle, unsigned int frame)) & PrimitiveMan::DrawBitmapPrimitive)
+		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped)) & PrimitiveMan::DrawBitmapPrimitive)
+		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const MOSprite* moSprite, float rotAngle, unsigned int frame)) & PrimitiveMan::DrawBitmapPrimitive)
+		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped)) & PrimitiveMan::DrawBitmapPrimitive)
 		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const std::string& filePath, float rotAngle)) & PrimitiveMan::DrawBitmapPrimitive)
 		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(const Vector& start, const std::string& filePath, float rotAngle, bool hFlipped, bool vFlipped)) & PrimitiveMan::DrawBitmapPrimitive)
 		    .def("DrawBitmapPrimitive", (void(PrimitiveMan::*)(int player, const Vector& start, const std::string& filePath, float rotAngle)) & PrimitiveMan::DrawBitmapPrimitive)

Source/Lua/LuaBindingsPrimitives.cpp

@@ -95,7 +95,7 @@ namespace RTE {
 	LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BitmapPrimitive) {
 		return luabind::class_<BitmapPrimitive, GraphicalPrimitive>("BitmapPrimitive")
 
-		    .def(luabind::constructor<int, const Vector&, const MOSprite*, float, int, bool, bool>())
+		    .def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool>())
 		    .def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>());
 	}
 } // namespace RTE

Source/Managers/PrimitiveMan.cpp

@@ -215,7 +215,7 @@ namespace RTE {
 		SchedulePrimitive(std::make_unique<TextPrimitive>(player, start, text, isSmall, alignment, rotAngle));
 	}
 
-	void PrimitiveMan::DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped) {
+	void PrimitiveMan::DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped) {
 		SchedulePrimitive(std::make_unique<BitmapPrimitive>(player, centerPos, moSprite, rotAngle, frame, hFlipped, vFlipped));
 	}
 

Source/Managers/PrimitiveMan.h

@@ -310,7 +310,7 @@ namespace RTE {
 		/// @param moSprite A MOSprite to draw BITMAP from.
 		/// @param rotAngle Rotation angle in radians.
 		/// @param frame Frame to draw.
-		void DrawBitmapPrimitive(const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame) { DrawBitmapPrimitive(-1, centerPos, moSprite, rotAngle, frame, false, false); }
+		void DrawBitmapPrimitive(const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame) { DrawBitmapPrimitive(-1, centerPos, moSprite, rotAngle, frame, false, false); }
 
 		/// Schedule to draw a bitmap primitive with the option to flip the primitive horizontally and vertically.
 		/// @param centerPos Position of primitive's center in scene coordinates.
@@ -319,15 +319,15 @@ namespace RTE {
 		/// @param frame Frame to draw.
 		/// @param hFlipped Whether to flip the sprite horizontally.
 		/// @param vFlipped Whether to flip the sprite vertically.
-		void DrawBitmapPrimitive(const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped) { DrawBitmapPrimitive(-1, centerPos, moSprite, rotAngle, frame, hFlipped, vFlipped); }
+		void DrawBitmapPrimitive(const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped) { DrawBitmapPrimitive(-1, centerPos, moSprite, rotAngle, frame, hFlipped, vFlipped); }
 
 		/// Schedule to draw a bitmap primitive visible only to a specified player.
 		/// @param player Player screen to draw primitive on.
 		/// @param centerPos Position of primitive's center in scene coordinates.
 		/// @param moSprite A MOSprite to draw BITMAP from.
 		/// @param rotAngle Rotation angle in radians.
 		/// @param frame Frame to draw.
-		void DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame) { DrawBitmapPrimitive(player, centerPos, moSprite, rotAngle, frame, false, false); }
+		void DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame) { DrawBitmapPrimitive(player, centerPos, moSprite, rotAngle, frame, false, false); }
 
 		/// Schedule to draw a bitmap primitive visible only to a specified player with the option to flip the primitive horizontally or vertically.
 		/// @param player Player screen to draw primitive on.
@@ -337,7 +337,7 @@ namespace RTE {
 		/// @param frame Frame to draw.
 		/// @param hFlipped Whether to flip the sprite horizontally.
 		/// @param vFlipped Whether to flip the sprite vertically.
-		void DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped);
+		void DrawBitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped);
 
 		/// Schedule to draw a bitmap primitive.
 		/// @param centerPos Position of primitive's center in scene coordinates.

Source/System/GraphicalPrimitive.h

@@ -557,7 +557,7 @@ namespace RTE {
 		/// @param frame Frame number of the MOSprite that will be drawn.
 		/// @param hFlipped Whether the BITMAP to draw should be horizontally flipped.
 		/// @param vFlipped Whether the BITMAP to draw should be vertically flipped.
-		BitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, int frame, bool hFlipped, bool vFlipped) :
+		BitmapPrimitive(int player, const Vector& centerPos, const MOSprite* moSprite, float rotAngle, unsigned int frame, bool hFlipped, bool vFlipped) :
 		    m_Bitmap(moSprite->GetSpriteFrame(frame)), m_RotAngle(rotAngle), m_HFlipped(hFlipped), m_VFlipped(vFlipped) {
 
 			m_StartPos = centerPos;