Merge branch 'development' into using-namespace-rte

Author: Causeless

.git-blame-ignore-revs

@@ -0,0 +1,15 @@
+27d409a89cb1607321404e0ebfe8bc0a63c337a3
+c80a961e5f0239a38b788ce86853bb79ed4e8651
+d5d14f26509c93046cf0a5237240d7424cd4e9a8
+18842d873018583c779d3c423fc1fe6f374b8f66
+be2baf37135bbfd93bb8d90d765a66141ad2ab6e
+dde53bfe198efcc04f55e1763fbe581115a618bd
+6d4b989edd3b15571fb33ee36ca5be60b034719d
+522463495db6a2943e7c9ace70e8102588ef3528
+b22c5ab241f040a16ef502a8b5f2bca125368060
+6ea2d54ba223da8f56a52f1f0346aff892e4a0ba
+71454b967661e51d6998ea95db9a46df158d87cd
+6c5b6167e266685e624153a4eb3794f83c34e62c
+f701bc23cfae7c1cafc48070d986ba16a5873416
+5efd90188ede818ed42fee06bb65f29cb892c54f
+b21b546e2dc9062b1918e7e01d517a537437bbc4

.github/scripts/add-eol.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sed -e '$a\' "$@"

.github/workflows/clang-format.yml

@@ -35,10 +35,42 @@ jobs:
 
       - name: Run clang-format
         run: |
-            .github/scripts/run-clang-format.py -r Source Data/Base.rte/Shaders \
+            .github/scripts/run-clang-format.py \
+                -i \
+                -r Source Data/Base.rte/Shaders \
                 --exclude Source/System/Base64 \
                 --exclude Source/System/BitMask \
                 --exclude Source/System/glad \
                 --exclude Source/System/MicroPather \
                 --exclude Source/System/Semver200 \
                 --exclude Source/System/StackWalker
+      - name: Add missing newlines
+        run: |
+            .github/scripts/run-clang-format.py \
+                -i --clang-format-executable .github/scripts/add-eol.sh \
+                -r Source Data/Base.rte/Shaders \
+                --exclude Source/System/Base64 \
+                --exclude Source/System/BitMask \
+                --exclude Source/System/glad \
+                --exclude Source/System/MicroPather \
+                --exclude Source/System/Semver200 \
+                --exclude Source/System/StackWalker
+      - name: Report changes
+        run: |
+          # Store the changes in a patch file first
+          git diff > clang-format-changes.patch
+          # if any changes were made, fail the build
+          if ! git diff --quiet ; then
+            echo "::error::Code misformatted. Run clang-format or apply the patch (printed below and attached to job summary) to fix."
+            # Print the changes to the console
+            cat clang-format-changes.patch
+            exit 1
+          fi
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        # Only upload the patch file if the build failed, meaning that the code was not properly formatted
+        if: failure()
+        with:
+          name: clang-format-changes.patch
+          path: |
+            clang-format-changes.patch

Source/Activities/GATutorial.h

@@ -185,14 +185,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!

Source/Activities/MultiplayerServerLobby.cpp

@@ -808,18 +808,20 @@ bool MultiplayerServerLobby::StartGame() {
 			}
 
 			// 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

Source/Entities/LimbPath.cpp

@@ -341,8 +341,8 @@ float LimbPath::GetRegularProgress() const {
 	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++;

Source/Entities/LimbPath.h

@@ -99,8 +99,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;
@@ -219,7 +219,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
@@ -374,7 +374,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

Source/Entities/MOSprite.h

@@ -88,7 +88,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/Entities/MovableObject.h

@@ -718,7 +718,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
@@ -732,7 +732,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
@@ -741,14 +741,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;
 		}
@@ -764,7 +764,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
@@ -774,7 +774,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
@@ -784,14 +784,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;
 		}