[ZH] Fix iterator errors for Zero Hour build (TheSuperHackers#426)

Author: xezon

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

@@ -265,7 +265,6 @@ class RailroadBehavior	: public PhysicsBehavior
 	void FindPosByPathDistance( Coord3D *pos, const Real dist, const Real length, Bool setState = FALSE );
 	void playImpactSound(Object *victim, const Coord3D *impactPosition);
 
-	TemplateNameIterator m_carriageTemplateNameIterator;
 	StationTask m_nextStationTask;
 	ObjectID m_trailerID; ///< the ID of the object I am directly pulling
 	PullInfo conductorPullInfo;

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

@@ -166,8 +166,9 @@ ObjectID CountermeasuresBehavior::calculateCountermeasureToDivertTo( const Objec
 
 	//Start at the end of the list and go towards the beginning.
 	CountermeasuresVec::iterator it = m_counterMeasures.end();
+	DEBUG_ASSERTCRASH(iteratorMax <= (Int)m_counterMeasures.size(), ("Unsafe size"));
 	//end is actually the end so advance the iterator.
-	if( it )
+	if( it != m_counterMeasures.begin() )
 	{
 		--it;
 		while( iteratorMax-- )

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

@@ -405,7 +405,7 @@ FlightDeckBehavior::FlightDeckInfo* FlightDeckBehavior::findPPI(ObjectID id)
 	for (std::vector<FlightDeckInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
 	{
 		if (it->m_objectInSpace == id)
-			return it;
+			return &(*it);
 	}
 
 	return NULL; 
@@ -420,7 +420,7 @@ FlightDeckBehavior::FlightDeckInfo* FlightDeckBehavior::findEmptyPPI()
 	for (std::vector<FlightDeckInfo>::iterator it = m_spaces.begin(); it != m_spaces.end(); ++it)
 	{
 		if( it->m_objectInSpace == INVALID_ID )
-			return it;
+			return &(*it);
 	}
 
 	return NULL;
@@ -880,7 +880,7 @@ Bool FlightDeckBehavior::calcBestParkingAssignment( ObjectID id, Coord3D *pos, I
 	//the back and keep looking at empty spaces until we find one with a plane blocking.
 
 	Bool checkForPlaneInWay = FALSE;
-	std::vector<FlightDeckInfo>::iterator bestIt = NULL;
+	std::vector<FlightDeckInfo>::iterator bestIt = m_spaces.end();
 	Object *bestJet = NULL;
 	Int bestIndex = 0, index = 0;
 	for( std::vector<FlightDeckInfo>::iterator thatIt = m_spaces.begin(); thatIt != m_spaces.end(); thatIt++, index++ )
@@ -889,7 +889,7 @@ Bool FlightDeckBehavior::calcBestParkingAssignment( ObjectID id, Coord3D *pos, I
 		if( myIt == thatIt )
 		{
 			//Done, don't look at my spot, nor spots behind me.
-			if( bestIt )
+			if( bestIt != m_spaces.end() )
 			{
 				myIt->m_objectInSpace = bestJet ? bestJet->getID() : INVALID_ID;
 				bestIt->m_objectInSpace = id;
@@ -941,7 +941,7 @@ Bool FlightDeckBehavior::calcBestParkingAssignment( ObjectID id, Coord3D *pos, I
 				if( pos )
 				{
 					pos->set( &myIt->m_prep ); //reset the original position.
-					bestIt = NULL;
+					bestIt = m_spaces.end();
 				}
 			}
 		}
@@ -1356,7 +1356,7 @@ void FlightDeckBehavior::exitObjectViaDoor( Object *newObj, ExitDoorType exitDoo
 		return;
 	}
 
-	newObj->setPosition( pCreationLocations->begin() );
+	newObj->setPosition( &(*pCreationLocations)[0] );
 	newObj->setOrientation( m_runways[ ppi->m_runway ].m_startOrient );
 	TheAI->pathfinder()->addObjectToPathfindMap( newObj );
 

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp

@@ -549,7 +549,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 					std::vector<Coord3D>::const_iterator it;
 					for( it = pTaxiLocations->begin(); it != pTaxiLocations->end(); it++ )
 					{
-						movePath->appendNode( it, LAYER_GROUND );
+						movePath->appendNode( &(*it), LAYER_GROUND );
 					}
 				}
 
@@ -617,7 +617,7 @@ class JetOrHeliTaxiState : public AIMoveOutOfTheWayState
 							firstNode = FALSE;
 							continue;
 						}
-						movePath->appendNode( it, LAYER_GROUND );
+						movePath->appendNode( &(*it), LAYER_GROUND );
 					}
 					movePath->appendNode( &ppinfo.runwayPrep, LAYER_GROUND );
 				}

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp

@@ -107,8 +107,6 @@ RailroadBehavior::RailroadBehavior( Thing *thing, const ModuleData *moduleData )
 {
 	const RailroadBehaviorModuleData *modData = getRailroadBehaviorModuleData();
 
-	m_carriageTemplateNameIterator = 0;
-
 	m_nextStationTask = DO_NOTHING;
 	m_trailerID = INVALID_ID;