ZH only changes.

Author: Caball009

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

@@ -1377,7 +1377,7 @@ static void doFindMostReadyWeaponForThing( Object *obj, void *userData )
 		return;
 	}
 
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -1409,7 +1409,7 @@ static void doFindMostReadySpecialPowerForThing( Object *obj, void *userData )
 		return;
 	}
 
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -1445,7 +1445,7 @@ static void doFindExistingObjectWithThingTemplate( Object *obj, void *userData )
 		return;
 	}
 
-	if( info->thing->isEquivalentTo( obj->getTemplate() ) )
+	if( info->thing && info->thing->isEquivalentTo( obj->getTemplate() ) )
 	{
 		if( !obj->testStatus( OBJECT_STATUS_UNDER_CONSTRUCTION ) 
 				&& !obj->testStatus( OBJECT_STATUS_SOLD ) 
@@ -2863,7 +2863,7 @@ static void countExisting( Object *obj, void *userData )
   TypeCountData *typeCountData = (TypeCountData *)userData;
 
   // Compare templates
-  if ( typeCountData->type->isEquivalentTo( obj->getTemplate() ) ||
+  if ( ( typeCountData->type && typeCountData->type->isEquivalentTo( obj->getTemplate() ) ) ||
        ( typeCountData->linkKey != NAMEKEY_INVALID && obj->getTemplate() != NULL && typeCountData->linkKey == obj->getTemplate()->getMaxSimultaneousLinkKey() ) )
   {
     typeCountData->count++;

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/RiderChangeContain.cpp

@@ -170,7 +170,7 @@ Bool RiderChangeContain::isValidContainerFor(const Object* rider, Bool checkCapa
 		for( int i = 0; i < MAX_RIDERS; i++ )
 		{
 			const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-			if( thing->isEquivalentTo( rider->getTemplate() ) )
+			if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 			{
 				//We found a valid rider, so return success.
 				return TRUE;
@@ -211,7 +211,7 @@ void RiderChangeContain::onContaining( Object *rider, Bool wasSelected )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 
 			//This is our rider, so set the correct model condition.
@@ -282,7 +282,7 @@ void RiderChangeContain::onRemoving( Object *rider )
 	for( int i = 0; i < MAX_RIDERS; i++ )
 	{
 		const ThingTemplate *thing = TheThingFactory->findTemplate( data->m_riders[ i ].m_templateName );
-		if( thing->isEquivalentTo( rider->getTemplate() ) )
+		if( thing && thing->isEquivalentTo( rider->getTemplate() ) )
 		{
 			//This is our rider, so clear the current model condition.
 			bike->clearModelConditionFlags( MAKE_MODELCONDITION_MASK2( data->m_riders[ i ].m_modelConditionFlagType, MODELCONDITION_DOOR_1_CLOSING ) );