[ZH] Fixed warnings about signed/unsigned integer comparison (TheSuperHackers#534)

Author: Bart Roossien

GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h

@@ -249,7 +249,7 @@ inline Drawable* GameClient::findDrawableByID( const DrawableID id )
 //
 //	return (*it).second;
 
-	if( (Int)id < m_drawableVector.size() )
+	if( static_cast<size_t>(id) < m_drawableVector.size() )
 		return m_drawableVector[(Int)id];
 
 	return NULL;

GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h

@@ -417,7 +417,7 @@ inline Object* GameLogic::findObjectByID( ObjectID id )
 //		return NULL;
 //	
 //	return (*it).second;
-	if( (Int)id < m_objVector.size() )
+	if( static_cast<size_t>(id) < m_objVector.size() )
 		return m_objVector[(Int)id];
 
 	return NULL;

GeneralsMD/Code/GameEngine/Source/Common/PartitionSolver.cpp

@@ -77,14 +77,13 @@ void PartitionSolver::solve(void)
 
 	Int minSizeForAllData = 0;
 	Int slotsAllotted = 0;
-	Int i, j;
 
 	// first, determine whether there is an actual solution, or we're going to have to fudge it.
-	for (i = 0; i < m_data.size(); ++i) {
+	for (size_t i = 0; i < m_data.size(); ++i) {
 		minSizeForAllData += m_data[i].second;
 	}
 
-	for (i = 0; i < m_spacesForData.size(); ++i) {
+	for (size_t i = 0; i < m_spacesForData.size(); ++i) {
 		slotsAllotted += m_spacesForData[i].second;
 	}
 
@@ -103,9 +102,9 @@ void PartitionSolver::solve(void)
 	{
 		// we prefer the fast, but not necessarily correct solution
 		// simply start placing the stuff. Skip things you can't place.
-		for (i = 0; i < m_data.size(); ++i) 
+		for (size_t i = 0; i < m_data.size(); ++i) 
 		{
-			for (j = 0; j < spacesStillAvailable.size(); ++j) 
+			for (size_t j = 0; j < spacesStillAvailable.size(); ++j) 
 			{
 				if (m_data[i].second <= spacesStillAvailable[j].second) 
 				{

GeneralsMD/Code/GameEngine/Source/Common/RTS/AcademyStats.cpp

@@ -1081,7 +1081,7 @@ Bool AcademyStats::calculateAcademyAdvice( AcademyAdviceInfo *info )
 	info->numTips = 0;
 
 	//Build the header for each string.
-	for( Int i = 0; i < maxAdviceTips; i++ )
+	for( size_t i = 0; i < maxAdviceTips; i++ )
 	{
 		info->advice[ i ].format( UnicodeString( L"\n\n" ) );
 	}

GeneralsMD/Code/GameEngine/Source/Common/RTS/PlayerTemplate.cpp

@@ -294,7 +294,7 @@ void PlayerTemplateStore::update()
 
 Int PlayerTemplateStore::getTemplateNumByName(AsciiString name) const
 {
-	for (Int num = 0; num < m_playerTemplates.size(); num++)
+	for (size_t num = 0; num < m_playerTemplates.size(); num++)
 	{
 		if (m_playerTemplates[num].getName().compareNoCase(name.str()) == 0)
 			return num;

GeneralsMD/Code/GameEngine/Source/Common/RTS/SpecialPower.cpp

@@ -255,7 +255,7 @@ SpecialPowerStore::~SpecialPowerStore( void )
 {
 
 	// delete all templates
-	for( Int i = 0; i < m_specialPowerTemplates.size(); ++i )
+	for( size_t i = 0; i < m_specialPowerTemplates.size(); ++i )
 		m_specialPowerTemplates[ i ]->deleteInstance();
 
 	// erase the list
@@ -272,7 +272,7 @@ SpecialPowerTemplate* SpecialPowerStore::findSpecialPowerTemplatePrivate( AsciiS
 {
 
 	// search the template list for matching name
-	for( Int i = 0; i < m_specialPowerTemplates.size(); ++i )
+	for( size_t i = 0; i < m_specialPowerTemplates.size(); ++i )
 		if( m_specialPowerTemplates[ i ]->getName() == name )
 			return m_specialPowerTemplates[ i ];
 
@@ -287,7 +287,7 @@ const SpecialPowerTemplate *SpecialPowerStore::findSpecialPowerTemplateByID( Uns
 {
 
 	// search the template list for matching name
-	for( Int i = 0; i < m_specialPowerTemplates.size(); ++i )
+	for( size_t i = 0; i < m_specialPowerTemplates.size(); ++i )
 		if( m_specialPowerTemplates[ i ]->getID() == id )
 			return m_specialPowerTemplates[ i ];
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp

@@ -3368,7 +3368,7 @@ void ControlBar::populateSpecialPowerShortcut( Player *player)
 						//button specifying a vector of sciences in the command button.
 						Int bestIndex = -1;
 						ScienceType science;
-						for( Int scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
+						for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 						{
 							science = commandButton->getScienceVec()[ scienceIndex ];
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp

@@ -372,7 +372,7 @@ void ControlBar::populateCommand( Object *obj )
 								//button specifying a vector of sciences in the command button.
 								Int bestIndex = -1;
 								ScienceType science;
-								for( Int scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
+								for( size_t scienceIndex = 0; scienceIndex < commandButton->getScienceVec().size(); ++scienceIndex )
 								{
 									science = commandButton->getScienceVec()[ scienceIndex ];
 
@@ -1240,7 +1240,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( TheUpgradeCenter->canAffordUpgrade( player, command->getUpgradeTemplate() ) == FALSE )
 				return COMMAND_RESTRICTED;//COMMAND_CANT_AFFORD;
 
-			for( Int i = 0; i < command->getScienceVec().size(); i++ )
+			for( size_t i = 0; i < command->getScienceVec().size(); i++ )
 			{
 				ScienceType st = command->getScienceVec()[ i ];
 				if( !player->hasScience( st ) )
@@ -1276,7 +1276,7 @@ CommandAvailability ControlBar::getCommandAvailability( const CommandButton *com
 			if( TheUpgradeCenter->canAffordUpgrade( player, command->getUpgradeTemplate() ) == FALSE )
 				return COMMAND_RESTRICTED;//COMMAND_CANT_AFFORD;
 
-			for( Int i = 0; i < command->getScienceVec().size(); i++ )
+			for( size_t i = 0; i < command->getScienceVec().size(); i++ )
 			{
 				ScienceType st = command->getScienceVec()[ i ];
 				if( !player->hasScience( st ) )

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -3332,7 +3332,7 @@ Bool W3DModelDraw::getProjectileLaunchOffset(
 	}
 	else
 	{
-		if (specificBarrelToUse < 0 || specificBarrelToUse >= wbvec.size())
+		if (specificBarrelToUse < 0 || specificBarrelToUse >= static_cast<long>(wbvec.size()))
 			specificBarrelToUse = 0;
 
 		if (launchPos)

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/pointgr.cpp

@@ -1695,7 +1695,7 @@ void PointGroupClass::RenderVolumeParticle(RenderInfoClass &rinfo, unsigned int
 
 
 	//// VOLUME_PARTICLE LOOP ///////////////
-	for ( int t = 0; t < depth; ++t )
+	for ( unsigned int t = 0; t < depth; ++t )
 	{