Merge pull request #45 from cortex-command-community/signedness-fixes

Fix signedness of some members

Author: Causeless

Source/Entities/LimbPath.cpp

@@ -341,8 +341,8 @@ float LimbPath::GetRegularProgress() const {
 	return prog / m_RegularLength;
 }
 
-unsigned int LimbPath::GetCurrentSegmentNumber() const {
-	unsigned int progress = 0;
+int LimbPath::GetCurrentSegmentNumber() const {
+	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

@@ -94,13 +94,13 @@ namespace RTE {
 		/// Gets the number of Vector:s the internal array of 'waypoints' or
 		/// segments of this LimbPath.
 		/// @return An int with he count.
-		unsigned int GetSegCount() const { return m_Segments.size(); }
+		int GetSegCount() const { return m_Segments.size(); }
 
 		/// 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(unsigned int segmentIndex) {
-			if (segmentIndex < m_Segments.size()) {
+		Vector* GetSegment(int segmentIndex) {
+			if (segmentIndex < static_cast<int>(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.
-		unsigned int GetCurrentSegmentNumber() const;
+		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;
 
-		unsigned int m_FootCollisionsDisabledSegment; //!< The segment after which foot collisions will be disabled for this limbpath, if it's for legs.
+		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/MOSRotating.cpp

@@ -1457,7 +1457,7 @@ bool MOSRotating::AttachableIsHardcoded(const Attachable* attachableToCheck) con
 		return false;
 	}
 
-	unsigned long attachableUniqueID = attachableToCheck->GetUniqueID();
+	long attachableUniqueID = attachableToCheck->GetUniqueID();
 	return m_HardcodedAttachableUniqueIDsAndRemovers.find(attachableUniqueID) != m_HardcodedAttachableUniqueIDsAndRemovers.end() || m_HardcodedAttachableUniqueIDsAndSetters.find(attachableUniqueID) != m_HardcodedAttachableUniqueIDsAndSetters.end();
 }
 

Source/Entities/MovableObject.cpp

@@ -22,7 +22,7 @@ using namespace RTE;
 
 AbstractClassInfo(MovableObject, SceneObject);
 
-std::atomic<unsigned long int> MovableObject::m_UniqueIDCounter = 1;
+std::atomic<long> MovableObject::m_UniqueIDCounter = 1;
 std::string MovableObject::ms_EmptyString = "";
 
 MovableObject::MovableObject() {

Source/Entities/MovableObject.h

@@ -720,7 +720,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(unsigned int n) {
+		Vector GetForceVector(size_t n) {
 			if (n > 0 && n < m_Forces.size())
 				return m_Forces[n].first;
 			else
@@ -734,7 +734,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(unsigned int n) {
+		Vector GetForceOffset(size_t n) {
 			if (n > 0 && n < m_Forces.size())
 				return m_Forces[n].second;
 			else
@@ -743,14 +743,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(unsigned int n, Vector v) {
+		void SetForceVector(size_t 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(unsigned int n, Vector v) {
+		void SetForceOffset(size_t n, Vector v) {
 			if (n > 0 && n < m_Forces.size())
 				m_Forces[n].second = v;
 		}
@@ -766,7 +766,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(unsigned int n) {
+		Vector GetImpulseVector(size_t n) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				return m_ImpulseForces[n].first;
 			else
@@ -776,7 +776,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(unsigned int n) {
+		Vector GetImpulseOffset(size_t n) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				return m_ImpulseForces[n].second;
 			else
@@ -786,14 +786,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(unsigned int n, Vector v) {
+		void SetImpulseVector(size_t 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(unsigned int n, Vector v) {
+		void SetImpulseOffset(size_t n, Vector v) {
 			if (n > 0 && n < m_ImpulseForces.size())
 				m_ImpulseForces[n].second = v;
 		}
@@ -939,11 +939,11 @@ namespace RTE {
 
 		/// Returns the next unique id for MO's and increments unique ID counter
 		/// @return Returns the next unique id.
-		static unsigned long int GetNextUniqueID() { return ++m_UniqueIDCounter; }
+		static long GetNextUniqueID() { return ++m_UniqueIDCounter; }
 
 		/// Returns this MO's unique persistent ID
 		/// @return Returns this MO's unique persistent ID
-		unsigned long int const GetUniqueID() const { return m_UniqueID; }
+		long GetUniqueID() const { return m_UniqueID; }
 
 		/// Gets the preset name and unique ID of this MO, often useful for error messages.
 		/// @return A string containing the unique ID and preset name of this MO.
@@ -1098,7 +1098,7 @@ namespace RTE {
 		// Member variables
 		static Entity::ClassInfo m_sClass;
 		// Global counter with unique ID's
-		static std::atomic<unsigned long int> m_UniqueIDCounter;
+		static std::atomic<long> m_UniqueIDCounter;
 		// The type of MO this is, either Actor, Item, or Particle
 		int m_MOType;
 		float m_Mass; // In metric kilograms (kg).
@@ -1229,7 +1229,7 @@ namespace RTE {
 		bool m_RandomizeEffectRotAngleEveryFrame;
 
 		// This object's unique persistent ID
-		long int m_UniqueID;
+		long m_UniqueID;
 		// In which radis should we look to remove orphaned terrain on terrain penetration,
 		// must not be greater than SceneMan::ORPHANSIZE, or will be truncated
 		int m_RemoveOrphanTerrainRadius;
@@ -1254,7 +1254,7 @@ namespace RTE {
 		// Unique ID of particle hit this MO
 		long int m_ParticleUniqueIDHit;
 		// Number of sim update frame when last collision was detected
-		unsigned int m_LastCollisionSimFrameNumber;
+		int m_LastCollisionSimFrameNumber;
 		int m_SimUpdatesBetweenScriptedUpdates; //!< The number of Sim updates between each scripted update for this MovableObject.
 		int m_SimUpdatesSinceLastScriptedUpdate; //!< The counter for the current number of Sim updates since this MovableObject last ran a scripted update.