Merge pull request #27 from janisozaur/sign-compare

Causeless · web-flow · commit 02b3f8556147 · 2024-01-21T01:21:11.000Z
Fix some GCC warnings
diff --git a/Source/Activities/GATutorial.h b/Source/Activities/GATutorial.h
@@ -186,14 +186,14 @@ namespace RTE {
 		// If teh screen has just changed and needs to be redrawn
 		bool m_ScreenChange;
 		// Which tutorial step of the current area currently being played back
-		int m_CurrentStep;
+		unsigned int m_CurrentStep;
 		// Which frame of the current step's animation are we on?
 		int m_CurrentFrame;
 		// Current room
 		TutorialRoom m_CurrentRoom;
 		// Trigger box for the subsequent fight
 		Box m_FightTriggers[FIGHTSTAGECOUNT];
-		int m_EnemyCount; //!< The amount of enemy actors at the start of the activity.
+		unsigned int m_EnemyCount; //!< The amount of enemy actors at the start of the activity.
 		// The current fight stage
 		FightStage m_CurrentFightStage;
 		// The CPU opponent brain; not owned!
diff --git a/Source/Activities/MultiplayerServerLobby.cpp b/Source/Activities/MultiplayerServerLobby.cpp
@@ -799,18 +799,20 @@ namespace RTE {
 				}
 
 				// Now set the selected tech's module index as what the metaplayer is going to use
-				if (pTechItem)
+				if (pTechItem) {
 					if (pTechItem->m_ExtraIndex == -2)
 						pGameActivity->SetTeamTech(team, "-All-");
 					else
 						pGameActivity->SetTeamTech(team, g_PresetMan.GetDataModuleName(pTechItem->m_ExtraIndex));
+				}
 			}
 
 			// Set up AI skill levels
-			if (m_apTeamAISkillSlider[team]->IsEnabled())
+			if (m_apTeamAISkillSlider[team]->IsEnabled()) {
 				pGameActivity->SetTeamAISkill(team, m_apTeamAISkillSlider[team]->GetValue());
-			else
+			} else {
 				pGameActivity->SetTeamAISkill(team, AISkillSetting::DefaultSkill);
+			}
 		}
 
 		// Force close all previously opened files
diff --git a/Source/Entities/LimbPath.cpp b/Source/Entities/LimbPath.cpp
@@ -333,8 +333,8 @@ namespace RTE {
 		return prog / m_RegularLength;
 	}
 
-	int LimbPath::GetCurrentSegmentNumber() const {
-		int progress = 0;
+	unsigned int LimbPath::GetCurrentSegmentNumber() const {
+		unsigned int progress = 0;
 		if (!m_Ended && !IsStaticPoint()) {
 			for (std::deque<Vector>::const_iterator itr = m_Segments.begin(); itr != m_CurrentSegment; ++itr) {
 				progress++;
diff --git a/Source/Entities/LimbPath.h b/Source/Entities/LimbPath.h
@@ -100,8 +100,8 @@ namespace RTE {
 		/// Gets a pointer to the segment at the given index. Ownership is NOT transferred.
 		/// @param segmentIndex The index of the segment to get.
 		/// @return A pointer to the segment at the given index. Ownership is NOT transferred.
-		Vector* GetSegment(int segmentIndex) {
-			if (segmentIndex >= 0 && segmentIndex < m_Segments.size()) {
+		Vector* GetSegment(unsigned int segmentIndex) {
+			if (segmentIndex < m_Segments.size()) {
 				return &m_Segments.at(segmentIndex);
 			}
 			return nullptr;
@@ -220,7 +220,7 @@ namespace RTE {
 
 		/// Gets the current segment as a number, rather than an iterator.
 		/// @return The current segment as a number.
-		int GetCurrentSegmentNumber() const;
+		unsigned int GetCurrentSegmentNumber() const;
 
 		/// Sets a new array of 'waypoints' or segments of this LimbPath.
 		/// @param newSpeed An int specifying how many segments there are in the following
@@ -375,7 +375,7 @@ namespace RTE {
 		// The iterator to the segment of the path that the limb ended up on the end of
 		std::deque<Vector>::iterator m_CurrentSegment;
 
-		int m_FootCollisionsDisabledSegment; //!< The segment after which foot collisions will be disabled for this limbpath, if it's for legs.
+		unsigned int m_FootCollisionsDisabledSegment; //!< The segment after which foot collisions will be disabled for this limbpath, if it's for legs.
 
 		// Normalized measure of how far the limb has progressed toward the
 		// current segment's target. 0.0 means its farther away than the
diff --git a/Source/Entities/MOSprite.h b/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.
diff --git a/Source/Entities/MovableObject.h b/Source/Entities/MovableObject.h
@@ -719,7 +719,7 @@ namespace RTE {
 		/// Returns force vector in newtons of the specified Force record.
 		/// @param n Force record index to get data from.
 		/// @return Force vector in newtons of the specified Force record.
-		Vector GetForceVector(int n) {
+		Vector GetForceVector(unsigned int n) {
 			if (n > 0 && n < m_Forces.size())
 				return m_Forces[n].first;
 			else
@@ -733,7 +733,7 @@ namespace RTE {
 		/// Returns offset vector in METERS (not pixels) of the specified Force record.
 		/// @param n Force record index to get data from.
 		/// @return Offset vector in meters of the specified Force record.
-		Vector GetForceOffset(int n) {
+		Vector GetForceOffset(unsigned int n) {
 			if (n > 0 && n < m_Forces.size())
 				return m_Forces[n].second;
 			else
@@ -742,14 +742,14 @@ namespace RTE {
 
 		/// Sets force vector in newtons of the specified Force record.
 		/// @param n Force record index to get data from. New Vector force value in newtons.
-		void SetForceVector(int n, Vector v) {
+		void SetForceVector(unsigned int n, Vector v) {
 			if (n > 0 && n < m_Forces.size())
 				m_Forces[n].first = v;
 		}
 
 		/// Sets offset vector in METERS (not pixels) of the specified Force record.
 		/// @param n Force record index to get data from. New Vector offset value in meters.
-		void SetForceOffset(int n, Vector v) {
+		void SetForceOffset(unsigned int n, Vector v) {
 			if (n > 0 && n < m_Forces.size())
 				m_Forces[n].second = v;
 		}
@@ -765,7 +765,7 @@ namespace RTE {
 		/// Returns Impulse vector in newtons of the specified Impulse record.
 		/// @param n Impulse record index to get data from.
 		/// @return Impulse vector in newtons of the specified Impulse record.
-		Vector GetImpulseVector(int n) {
+		Vector GetImpulseVector(unsigned int n) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				return m_ImpulseForces[n].first;
 			else
@@ -775,7 +775,7 @@ namespace RTE {
 		/// Returns offset vector in METERS (not pixels) of the specified Impulse record.
 		/// @param n Impulse record index to get data from.
 		/// @return Offset vector in meters of the specified Impulse record.
-		Vector GetImpulseOffset(int n) {
+		Vector GetImpulseOffset(unsigned int n) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				return m_ImpulseForces[n].second;
 			else
@@ -785,14 +785,14 @@ namespace RTE {
 		/// Returns offset vector in METERS (not pixels) of the specified Impulse record.
 		/// @param n Impulse record index to get data from.
 		/// @return Offset vector in meters of the specified Impulse record.
-		void SetImpulseVector(int n, Vector v) {
+		void SetImpulseVector(unsigned int n, Vector v) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				m_ImpulseForces[n].first = v;
 		}
 
 		/// Sets offset vector in METERS (not pixels) of the specified Impulse record.
 		/// @param n Impulse record index to get data from. New Vector offset value in meters.
-		void SetImpulseOffset(int n, Vector v) {
+		void SetImpulseOffset(unsigned int n, Vector v) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				m_ImpulseForces[n].second = v;
 		}
diff --git a/Source/Lua/LuaBindingsManagers.cpp b/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)
diff --git a/Source/Lua/LuaBindingsPrimitives.cpp b/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
diff --git a/Source/Lua/LuabindObjectWrapper.h b/Source/Lua/LuabindObjectWrapper.h
@@ -31,7 +31,7 @@ namespace RTE {
 
 		/// Constructor method used to instantiate a LuabindObjectWrapper object in system memory.
 		explicit LuabindObjectWrapper(luabind::adl::object* luabindObject, const std::string_view& filePath, bool ownsObject = true) :
-		    m_LuabindObject(luabindObject), m_FilePath(filePath), m_OwnsObject(ownsObject) {}
+		    m_OwnsObject(ownsObject), m_LuabindObject(luabindObject), m_FilePath(filePath) {}
 #pragma endregion
 
 #pragma region Destruction
diff --git a/Source/Managers/MetaMan.h b/Source/Managers/MetaMan.h
@@ -145,12 +145,12 @@ namespace RTE {
 		/// Gets the designated team of a specific player
 		/// @param metaPlayer Which player.
 		/// @return The team of that player.
-		int GetTeamOfPlayer(int metaPlayer) const { return metaPlayer >= Players::PlayerOne && metaPlayer < m_Players.size() ? m_Players[metaPlayer].GetTeam() : Activity::NoTeam; }
+		int GetTeamOfPlayer(int metaPlayer) const { return metaPlayer >= Players::PlayerOne && metaPlayer < static_cast<int>(m_Players.size()) ? m_Players[metaPlayer].GetTeam() : Activity::NoTeam; }
 
 		/// Gets the specified MetaPlayer
 		/// @param metaPlayer Which player.
 		/// @return The requested MetaPlayer
-		MetaPlayer* GetPlayer(int metaPlayer) { return (metaPlayer >= Players::PlayerOne && metaPlayer < m_Players.size()) ? &(m_Players[metaPlayer]) : 0; }
+		MetaPlayer* GetPlayer(int metaPlayer) { return (metaPlayer >= Players::PlayerOne && metaPlayer < static_cast<int>(m_Players.size())) ? &(m_Players[metaPlayer]) : nullptr; }
 
 		/// Gets the MetaPlayer playing a specific in-game player, if any.
 		/// @param inGamePlayer Which in-game player to translate into a metaplayer.
@@ -247,7 +247,7 @@ namespace RTE {
 
 		/// Checks wheter a certain player index is valid for the current game
 		/// @return Whether the player index passed in is active for the current game.
-		bool IsActivePlayer(int metaPlayer) { return metaPlayer >= Players::PlayerOne && metaPlayer < m_Players.size(); }
+		bool IsActivePlayer(int metaPlayer) { return metaPlayer >= Players::PlayerOne && metaPlayer < static_cast<int>(m_Players.size()); }
 
 		/// Checks wheter a certain team index is valid for the current game
 		/// @return Whether the team index passed in is active for the current game.
@@ -332,7 +332,7 @@ namespace RTE {
 		// The Activities generated by the current round's offensive maneuvers
 		std::vector<GAScripted*> m_RoundOffensives;
 		// The current offensive action that we're about to play next
-		int m_CurrentOffensive;
+		unsigned int m_CurrentOffensive;
 		// Game difficulty
 		int m_Difficulty;
 		// Teams AI Skill
diff --git a/Source/Managers/PrimitiveMan.cpp b/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));
 	}
 
diff --git a/Source/Managers/PrimitiveMan.h b/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.
diff --git a/Source/Menus/GibEditorGUI.cpp b/Source/Menus/GibEditorGUI.cpp
@@ -420,7 +420,7 @@ void GibEditorGUI::Update() {
 			m_CursorPos = g_SceneMan.SnapPosition(m_CursorPos);
 		}
 
-		if (m_pController->IsState(RELEASE_PRIMARY))
+		if (m_pController->IsState(RELEASE_PRIMARY)) {
 
 			// Cancel placing if secondary button is pressed
 			if (m_pController->IsState(PRESS_SECONDARY) || m_pController->IsState(PIE_MENU_ACTIVE)) {
@@ -449,6 +449,7 @@ void GibEditorGUI::Update() {
 					// Go back to previous mode
 					m_EditorGUIMode = m_PreviousMode;
 			}
+		}
 
 		// Set the facing of AHumans based on right/left cursor movements
 		AHuman* pAHuman = dynamic_cast<AHuman*>(m_pCurrentGib);
diff --git a/Source/Menus/MetagameGUI.cpp b/Source/Menus/MetagameGUI.cpp
diff --git a/Source/Menus/MetagameGUI.h b/Source/Menus/MetagameGUI.h
diff --git a/Source/System/GraphicalPrimitive.h b/Source/System/GraphicalPrimitive.h

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ namespace RTE {`
`95`	`95`	`LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, BitmapPrimitive) {`
`96`	`96`	`return luabind::class_<BitmapPrimitive, GraphicalPrimitive>("BitmapPrimitive")`
`97`	`97`
`98`		`- .def(luabind::constructor<int, const Vector&, const MOSprite*, float, int, bool, bool>())`
	`98`	`+ .def(luabind::constructor<int, const Vector&, const MOSprite*, float, unsigned int, bool, bool>())`
`99`	`99`	`.def(luabind::constructor<int, const Vector&, const std::string&, float, bool, bool>());`
`100`	`100`	`}`
`101`	`101`	`} // namespace RTE`