[ZH] Fix loop index type for unsigned integer comparison warnings (#804)

Author: Mauller

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( UnsignedInt i = 0; i < maxAdviceTips; i++ )
 	{
 		info->advice[ i ].format( UnicodeString( L"\n\n" ) );
 	}

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp

@@ -1511,7 +1511,7 @@ void populatePlayerInfo( Player *player, Int pos)
 				AcademyAdviceInfo info;
 				if( player->getAcademyStats()->calculateAcademyAdvice( &info ) )
 				{
-					for( Int i = 0; i < info.numTips; i++ )
+					for( UnsignedInt i = 0; i < info.numTips; i++ )
 					{
 						GadgetListBoxAddEntryText( listboxAcademyWindowScoreScreen, info.advice[ i ],	GameSpyColor[GSCOLOR_DEFAULT], -1 );
 					}

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

@@ -218,7 +218,7 @@ GameClient::~GameClient()
 	TheVideoPlayer = NULL;
 
 	// destroy all translators
-	for( Int i = 0; i < m_numTranslators; i++ )
+	for( UnsignedInt i = 0; i < m_numTranslators; i++ )
 		TheMessageStream->removeTranslator( m_translators[ i ] );	
 	m_numTranslators = 0;
 	m_commandTranslator = NULL;

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -3491,7 +3491,7 @@ void InGameUI::postDraw( void )
 		UnsignedByte r, g, b, a;
 		GameGetColorComponents( m_militarySubtitle->color, &r, &g, &b, &a );
 		dropColor = GameMakeColor( 0, 0, 0, a );
-		for(Int i = 0; i <= m_militarySubtitle->currentDisplayString; i++)
+		for(UnsignedInt i = 0; i <= m_militarySubtitle->currentDisplayString; i++)
 		{
 			m_militarySubtitle->displayStrings[i]->draw(pos.x,pos.y, m_militarySubtitle->color,dropColor );
 			Int height;
@@ -4123,7 +4123,7 @@ void InGameUI::removeMilitarySubtitle( void )
 	TheInGameUI->clearTooltipsDisabled();
 
 	// loop through and free up the display strings
-	for(Int i = 0; i <= m_militarySubtitle->currentDisplayString; i ++)
+	for(UnsignedInt i = 0; i <= m_militarySubtitle->currentDisplayString; i ++)
 	{
 		TheDisplayStringManager->freeDisplayString(m_militarySubtitle->displayStrings[i]);
 		m_militarySubtitle->displayStrings[i] = NULL;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Behavior/CountermeasuresBehavior.cpp

@@ -301,7 +301,7 @@ void CountermeasuresBehavior::launchVolley()
 	Object *obj = getObject();
 
 	Real volleySize = (Real)data->m_volleySize;
-	for( int i = 0; i < data->m_volleySize; i++ )
+	for( UnsignedInt i = 0; i < data->m_volleySize; i++ )
 	{
 		//Each flare in a volley will calculate a different vector to fly out. We have a +/- angle to 
 		//spread out equally. With only one flare, it'll come straight out the back. Two flares will

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/UnitCrateCollide.cpp

@@ -63,7 +63,7 @@ Bool UnitCrateCollide::executeCrateBehavior( Object *other )
 		return FALSE;
 	}
 
-	for( Int unitIndex = 0; unitIndex < unitCount; unitIndex++ )
+	for( UnsignedInt unitIndex = 0; unitIndex < unitCount; unitIndex++ )
 	{
 		Team *creationTeam = other->getControllingPlayer()->getDefaultTeam();
 		Object *newObj = TheThingFactory->newObject( unitType, creationTeam );

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/ObjectCreationList.cpp

@@ -322,7 +322,7 @@ class DeliverPayloadNugget : public ObjectCreationNugget
 		}
 
 		Object *firstTransport = NULL;
-		for( Int formationIndex = 0; formationIndex < m_formationSize; formationIndex++ )
+		for( UnsignedInt formationIndex = 0; formationIndex < m_formationSize; formationIndex++ )
 		{
 			Coord3D offset;
 			offset.zero();

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/EMPUpdate.cpp

@@ -307,7 +307,7 @@ void EMPUpdate::doDisableAttack( void )
 
 					UnsignedInt emitterCount = MAX(15, REAL_TO_INT_CEIL(data->m_sparksPerCubicFoot * victimVolume));
 
-					for (Int e = 0 ; e < emitterCount; ++e)
+					for (UnsignedInt e = 0 ; e < emitterCount; ++e)
 					{
 
 						ParticleSystem *sys = TheParticleSystemManager->createParticleSystem(tmp);

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/ParticleUplinkCannonUpdate.cpp

@@ -799,7 +799,7 @@ void ParticleUplinkCannonUpdate::createOuterNodeParticleSystems( IntensityTypes
 		if( tmp )
 		{
 			ParticleSystem *system;
-			for( int i = 0; i < data->m_outerEffectNumBones; i++ )
+			for( UnsignedInt i = 0; i < data->m_outerEffectNumBones; i++ )
 			{
 				system = TheParticleSystemManager->createParticleSystem( tmp );
 				if( system )
@@ -844,7 +844,7 @@ void ParticleUplinkCannonUpdate::createConnectorLasers( IntensityTypes intensity
 		const ThingTemplate *thingTemplate = TheThingFactory->findTemplate( str );
 		if( thingTemplate )
 		{
-			for( int i = 0; i < data->m_outerEffectNumBones; i++ )
+			for( UnsignedInt i = 0; i < data->m_outerEffectNumBones; i++ )
 			{
 				Drawable *beam = TheThingFactory->newDrawable( thingTemplate );
 				if( beam )
@@ -1021,7 +1021,7 @@ void ParticleUplinkCannonUpdate::createGroundHitParticleSystem( IntensityTypes i
 void ParticleUplinkCannonUpdate::removeAllEffects()
 {
 	const ParticleUplinkCannonUpdateModuleData *data = getParticleUplinkCannonUpdateModuleData();
-	for( int i = 0; i < data->m_outerEffectNumBones; i++ )
+	for( UnsignedInt i = 0; i < data->m_outerEffectNumBones; i++ )
 	{
 		if( m_outerSystemIDs && m_outerSystemIDs[ i ] )
 		{
@@ -1074,7 +1074,7 @@ Bool ParticleUplinkCannonUpdate::calculateDefaultInformation()
 		return FALSE;
 	}
 
-	for( int i = 0; i < data->m_outerEffectNumBones; i++ )
+	for( UnsignedInt i = 0; i < data->m_outerEffectNumBones; i++ )
 	{
 		m_laserBeamIDs[ i ] = INVALID_DRAWABLE_ID;
 		m_outerSystemIDs[ i ] = INVALID_PARTICLE_SYSTEM_ID;

GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp

@@ -764,7 +764,7 @@ static void populateRandomSideAndColor( GameInfo *game )
 			// get a few values at random to get rid of the dreck.
 			// there's no mathematical basis for this, but empirically, it helps a lot.
 			UnsignedInt silly = GetGameLogicRandomSeed() % 7;
-			for (Int poo = 0; poo < silly; ++poo) 
+			for (UnsignedInt poo = 0; poo < silly; ++poo) 
 			{
 				GameLogicRandomValue(0, 1);	// ignore result
 			}

GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp

@@ -231,8 +231,8 @@ void ConnectionManager::reset()
 		m_transport = NULL;
 	}
 
-	Int i = 0;
-	for (; i < NUM_CONNECTIONS; ++i) {
+	UnsignedInt i = 0;
+	for (; i < (UnsignedInt)NUM_CONNECTIONS; ++i) {
 		if (m_connections[i] != NULL) {
 			m_connections[i]->deleteInstance();
 			m_connections[i] = NULL;
@@ -278,7 +278,7 @@ void ConnectionManager::reset()
 		m_latencyAverages[i] = 0.0;
 	}
 
-	for (i = 0; i < MAX_SLOTS; ++i) {
+	for (i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
 		m_packetRouterFallback[i] = -1;
 	}
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/FrameMetrics.cpp

@@ -72,7 +72,7 @@ void FrameMetrics::init() {
 	m_averageLatency = (Real)0.2;
 	m_minimumCushion = -1;
 
-	Int i = 0;
+	UnsignedInt i = 0;
 	for (; i < TheGlobalData->m_networkFPSHistoryLength; ++i) {
 		m_fpsList[i] = 30.0;
 	}

GeneralsMD/Code/GameEngine/Source/GameNetwork/NAT.cpp

@@ -317,7 +317,7 @@ NATConnectionState NAT::connectionUpdate() {
 
 	// check to see if its time to send out our keepalives.
 	if (timeGetTime() >= m_nextKeepaliveTime) {
-		for (Int node = 0; node < m_numNodes; ++node) {
+		for (UnsignedInt node = 0; node < m_numNodes; ++node) {
 			if (m_myConnections[node] == TRUE) {
 				// we've made this connection, send a keepalive.
 				Int slotIndex = m_connectionNodes[node].m_slotIndex;
@@ -637,7 +637,7 @@ Int NAT::getSlotPort(Int slot) {
 }
 
 void NAT::generatePortNumbers(GameSlot *slotList[], Int localSlot) {
-	for (Int i = 0; i < MAX_SLOTS; ++i) {
+	for (UnsignedInt i = 0; i < (UnsignedInt)MAX_SLOTS; ++i) {
 		if (slotList[i] != NULL) {
 			if ((i == localSlot) && (TheWritableGlobalData->m_firewallPortOverride != 0)) {
 				slotList[i]->setPort(TheWritableGlobalData->m_firewallPortOverride);
@@ -950,7 +950,7 @@ Bool NAT::allConnectionsDone() {
 
 Bool NAT::allConnectionsDoneThisRound() {
 	Bool retval = TRUE;
-	for (Int i = 0; (i < m_numNodes) && (retval == TRUE); ++i) {
+	for (UnsignedInt i = 0; (i < m_numNodes) && (retval == TRUE); ++i) {
 		if ((m_connectionStates[i] != NATCONNECTIONSTATE_DONE) && (m_connectionStates[i] != NATCONNECTIONSTATE_FAILED)) {
 			retval = FALSE;
 		}

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetCommandWrapperList.cpp

@@ -46,7 +46,7 @@ NetCommandWrapperListNode::NetCommandWrapperListNode(NetWrapperCommandMsg *msg)
 	m_chunksPresent = NEW Bool[m_numChunks];	// pool[]ify
 	m_numChunksPresent = 0;
 
-	for (Int i = 0; i < m_numChunks; ++i) {
+	for (UnsignedInt i = 0; i < m_numChunks; ++i) {
 		m_chunksPresent[i] = FALSE;
 	}
 

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

@@ -156,7 +156,7 @@ W3DLaserDraw::W3DLaserDraw( Thing *thing, const ModuleData* moduleData ) :
 	//Allocate an array of lines equal to the number of beams * segments
 	m_line3D = NEW SegmentedLineClass *[ data->m_numBeams * data->m_segments ];
 
-	for( int segment = 0; segment < data->m_segments; segment++ )
+	for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
 	{
 		//We don't care about segment positioning yet until we actually set the position
 
@@ -225,7 +225,7 @@ W3DLaserDraw::~W3DLaserDraw( void )
 {
 	const W3DLaserDrawModuleData *data = getW3DLaserDrawModuleData();
 
-	for( int i = 0; i < data->m_numBeams * data->m_segments; i++ )
+	for( UnsignedInt i = 0; i < data->m_numBeams * data->m_segments; i++ )
 	{
 
 		// remove line from scene
@@ -272,7 +272,7 @@ void W3DLaserDraw::doDrawModule(const Matrix3D* transformMtx)
 
 		Vector3 laserPoints[ 2 ];
 
-		for( int segment = 0; segment < data->m_segments; segment++ )
+		for( UnsignedInt segment = 0; segment < data->m_segments; segment++ )
 		{
 			if( data->m_arcHeight > 0.0f && data->m_segments > 1 )
 			{

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

@@ -3962,7 +3962,7 @@ void W3DModelDraw::doHideShowProjectileObjects( UnsignedInt showCount, UnsignedI
 	ModelConditionInfo::HideShowSubObjInfo oneEntry;
 	if (m_curState->m_weaponProjectileHideShowName[slot].isEmpty())
 	{
-		for( Int projectileIndex = 0; projectileIndex < maxCount; projectileIndex++ )
+		for( UnsignedInt projectileIndex = 0; projectileIndex < maxCount; projectileIndex++ )
 		{
 			oneEntry.subObjName.format("%s%02d", m_curState->m_weaponProjectileLaunchBoneName[slot].str(), (projectileIndex + 1));
 			oneEntry.hide = ((projectileIndex + 1) <= hideCount);

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -3475,7 +3475,7 @@ void WaterRenderObjClass::xfer( Xfer *xfer )
 	}  // end if
 
 	// xfer each of the mesh data points
-	for( Int i = 0; i < m_meshDataSize; ++i )
+	for( UnsignedInt i = 0; i < m_meshDataSize; ++i )
 	{
 
 		// height

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 )
 	{