[GEN] Fix type declaration scope issues for Generals build (#484)

Author: xezon

Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h

@@ -515,7 +515,8 @@ class PartitionData : public MemoryPoolObject
 
 	inline Int wasSeenByAnyPlayers() const	///<check if a player in the game has seen the object but is now looking at fogged version.
 	{	
-		for (Int i=0; i<MAX_PLAYER_COUNT; i++)
+		Int i=0;
+		for (; i<MAX_PLAYER_COUNT; i++)
 			if (m_everSeenByPlayer[i] && m_shroudedness[i] == OBJECTSHROUD_FOGGED)
 				return i;
 		return i;

Generals/Code/GameEngine/Source/Common/INI/INI.cpp

@@ -316,7 +316,8 @@ static INIBlockParse findBlockParse(const char* token)
 //-------------------------------------------------------------------------------------------------
 static INIFieldParseProc findFieldParse(const FieldParse* parseTable, const char* token, int& offset, const void*& userData)
 {
-	for (const FieldParse* parse = parseTable; parse->token; ++parse)
+	const FieldParse* parse = parseTable;
+	for (; parse->token; ++parse)
 	{
 		if (strcmp( parse->token, token ) == 0)
 		{

Generals/Code/GameEngine/Source/Common/MessageStream.cpp

@@ -104,7 +104,8 @@ GameMessageArgumentDataType GameMessage::getArgumentDataType( Int argIndex )
 		return ARGUMENTDATATYPE_UNKNOWN;
 	}
 	int i=0;
-	for (GameMessageArgument *a = m_argList; a && (i < argIndex); a=a->m_next, ++i );
+	GameMessageArgument *a = m_argList;
+	for (; a && (i < argIndex); a=a->m_next, ++i );
 
 	if (a != NULL)
 	{

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -1698,7 +1698,8 @@ void Player::setUnitsShouldHunt(Bool unitsShouldHunt, CommandSourceType source)
 //=============================================================================
 void Player::killPlayer(void)
 {
-	for (PlayerTeamList::iterator it = m_playerTeamPrototypes.begin(); it != m_playerTeamPrototypes.end(); ++it) {
+	PlayerTeamList::iterator it = m_playerTeamPrototypes.begin();
+	for (; it != m_playerTeamPrototypes.end(); ++it) {
 		for (DLINK_ITERATOR<Team> iter = (*it)->iterate_TeamInstanceList(); !iter.done(); iter.advance()) {
 			Team *team = iter.cur();
 			if (!team) {

Generals/Code/GameEngine/Source/Common/System/GameMemory.cpp

@@ -1655,7 +1655,8 @@ void* MemoryPool::allocateBlockDoNotZeroImplementation(DECLARE_LITERALSTRING_ARG
 	{
 		// hmm... the current 'free' blob has nothing available. look and see if there
 		// are any other existing blobs with freespace.
-		for (MemoryPoolBlob *blob = m_firstBlob; blob != NULL; blob = blob->getNextInList()) 
+		MemoryPoolBlob *blob = m_firstBlob;
+		for (; blob != NULL; blob = blob->getNextInList()) 
 		{
 			if (blob->hasAnyFreeBlocks())
 			 	break;
@@ -2687,7 +2688,8 @@ MemoryPool *MemoryPoolFactory::createMemoryPool(const char *poolName, Int alloca
 */
 MemoryPool *MemoryPoolFactory::findMemoryPool(const char *poolName)
 {
-	for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+	MemoryPool *pool = m_firstPoolInFactory;
+	for (; pool; pool = pool->getNextPoolInList())
 	{
 		if (!strcmp(poolName, pool->getPoolName())) 
 		{
@@ -3149,7 +3151,8 @@ void MemoryPoolFactory::debugMemoryReport(Int flags, Int startCheckpoint, Int en
 		DEBUG_LOG(("------------------------------------------\n"));
 		DEBUG_LOG(("Begin Pool Overflow Report\n"));
 		DEBUG_LOG(("------------------------------------------\n"));
-		for (MemoryPool *pool = m_firstPoolInFactory; pool; pool = pool->getNextPoolInList())
+		MemoryPool *pool = m_firstPoolInFactory;
+		for (; pool; pool = pool->getNextPoolInList())
 		{
 			if (pool->getPeakBlockCount() > pool->getInitialBlockCount())
 			{

Generals/Code/GameEngine/Source/Common/System/Radar.cpp

@@ -1010,7 +1010,8 @@ void Radar::createEvent( const Coord3D *world, RadarEventType type, Real seconds
 
 	// lookup the colors we are to used based on the event 
 	RGBAColorInt color[ 2 ];
-	for( Int i = 0; radarColorLookupTable[ i ].event != RADAR_EVENT_INVALID; ++i )
+	Int i = 0;
+	for( ; radarColorLookupTable[ i ].event != RADAR_EVENT_INVALID; ++i )
 	{
 
 		if( radarColorLookupTable[ i ].event == type )

Generals/Code/GameEngine/Source/Common/System/StackDump.cpp

@@ -559,7 +559,8 @@ void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info )
 	/*
 	** Match the exception type with the error string and print it out
 	*/
-	for ( int i=0 ; _codes[i] != 0xffffffff ; i++ )
+	int i=0;
+	for ( ; _codes[i] != 0xffffffff ; i++ )
 	{
 		if ( _codes[i] == e_info->ExceptionRecord->ExceptionCode )
 		{

Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp

@@ -1169,7 +1169,8 @@ void ThingTemplate::initForLTA(const AsciiString& name)
 
 	char buffer[1024];
 	strncpy(buffer, name.str(), sizeof(buffer));
-	for (int i=0; buffer[i]; i++) {
+	int i=0;
+	for (; buffer[i]; i++) {
 		if (buffer[i] == '/') {
 			i++;
 			break;

Generals/Code/GameEngine/Source/Common/UserPreferences.cpp

@@ -807,7 +807,8 @@ Bool LadderPreferences::loadProfile( Int profileID )
 			continue;
 
 		p.port = atoi( ptr + 1 );
-		for (Int i=0; i<strlen(ptr); ++i)
+		Int i=0;
+		for (; i<strlen(ptr); ++i)
 		{
 			ladName.removeLastChar();
 		}

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

@@ -3093,8 +3093,8 @@ void ControlBar::updateRadarAttackGlow ( void )
 }
 void ControlBar::initSpecialPowershortcutBar( Player *player)
 {
-
-	for( Int i = 0; i < MAX_SPECIAL_POWER_SHORTCUTS; ++i )
+	Int i = 0;
+	for( ; i < MAX_SPECIAL_POWER_SHORTCUTS; ++i )
 	{
 		m_specialPowerShortcutButtonParents[i] = NULL;
 		m_specialPowerShortcutButtons[i] = NULL;