Merge pull request #469 from GeneralsOnlineDevelopmentTeam/seer/bugfix/player-template-null-checks

bugfix(player): Add null checks for player template access

Author: x64-dev

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

@@ -1767,7 +1767,8 @@ void Player::transferAssetsFromThat(Player *that)
 	std::list<Object *> objsToTransfer;
 
 	// let's not transfer beacons
-	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( that->getPlayerTemplate()->getBeaconTemplate() );
+	const PlayerTemplate *thatPlayerTemplate = that->getPlayerTemplate();
+	const ThingTemplate *beaconTemplate = thatPlayerTemplate ? TheThingFactory->findTemplate( thatPlayerTemplate->getBeaconTemplate() ) : nullptr;
 
 	// transfer all his units.
 	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin();

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

@@ -1883,7 +1883,8 @@ void ControlBar::evaluateContextUI()
 				switchToContext( CB_CONTEXT_COMMAND, drawToEvaluateFor );
 
 			}
-			else if (obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
+			else if (obj->getControllingPlayer()->getPlayerTemplate()
+				&& obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
 			{
 				switchToContext( CB_CONTEXT_BEACON, drawToEvaluateFor );
 			}

Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp

@@ -3084,7 +3084,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				(TheGlobalData->m_netMinPlayers==0 || TheGameInfo->isMultiPlayer()))
 			{
 				Int count;
-				const ThingTemplate *thing = TheThingFactory->findTemplate( ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate() );
+				const PlayerTemplate *localPlayerTemplate = ThePlayerList->getLocalPlayer()->getPlayerTemplate();
+				const ThingTemplate *thing = localPlayerTemplate ? TheThingFactory->findTemplate( localPlayerTemplate->getBeaconTemplate() ) : nullptr;
 				ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate( 1, &thing, false, &count );
 				DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active", count));
 				if (count < TheMultiplayerSettings->getMaxBeaconsPerPlayer())

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

@@ -2136,7 +2136,8 @@ void Player::transferAssetsFromThat(Player *that)
 	std::list<Object *> objsToTransfer;
 
 	// let's not transfer beacons
-	const ThingTemplate *beaconTemplate = TheThingFactory->findTemplate( that->getPlayerTemplate()->getBeaconTemplate() );
+	const PlayerTemplate *thatPlayerTemplate = that->getPlayerTemplate();
+	const ThingTemplate *beaconTemplate = thatPlayerTemplate ? TheThingFactory->findTemplate( thatPlayerTemplate->getBeaconTemplate() ) : nullptr;
 
 	// transfer all his units.
 	for (PlayerTeamList::iterator it = that->m_playerTeamPrototypes.begin();

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

@@ -1908,7 +1908,8 @@ void ControlBar::evaluateContextUI()
 				switchToContext( CB_CONTEXT_COMMAND, drawToEvaluateFor );
 
 			}
-			else if (obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
+			else if (obj->getControllingPlayer()->getPlayerTemplate()
+				&& obj->getControllingPlayer()->getPlayerTemplate()->getBeaconTemplate().compare(obj->getTemplate()->getName()) == 0)
 			{
 				switchToContext( CB_CONTEXT_BEACON, drawToEvaluateFor );
 			}

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

@@ -3298,7 +3298,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 			(TheGlobalData->m_netMinPlayers == 0 || TheGameInfo->isMultiPlayer()))
 		{
 			Int count;
-			const ThingTemplate* thing = TheThingFactory->findTemplate(ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate());
+			const PlayerTemplate* localPlayerTemplate = ThePlayerList->getLocalPlayer()->getPlayerTemplate();
+			const ThingTemplate* thing = localPlayerTemplate ? TheThingFactory->findTemplate(localPlayerTemplate->getBeaconTemplate()) : nullptr;
 			ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate(1, &thing, false, &count);
 			DEBUG_LOG(("MSG_META_PLACE_BEACON - Player already has %d beacons active", count));
 			if (count < TheMultiplayerSettings->getMaxBeaconsPerPlayer())