refactor: Revert previous solution

Author: Stubbjax

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

@@ -216,7 +216,6 @@ class Object : public Thing, public Snapshot
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
 	VeterancyLevel getVeterancyLevel() const;
-	Bool isTrainable() const; ///< Can this unit - or its rider - gain veterancy?
 
 	inline const AsciiString& getName() const { return m_name; }
 	inline void setName( const AsciiString& newName ) { m_name = newName; }

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

@@ -4128,7 +4128,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					continue;
 
 				ExperienceTracker *et = pObject->getExperienceTracker();
-				if (!et || !pObject->isTrainable())
+				if (!et || !et->isTrainable())
 					continue;
 
 				VeterancyLevel oldVet = et->getVeterancyLevel();

Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/SalvageCrateCollide.cpp

@@ -135,7 +135,7 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 		return FALSE;
 
 	// Sorry, you can't gain levels
-	if (!other->isTrainable())
+	if( !other->getExperienceTracker()->isTrainable() )
 		return FALSE;
 
 	return TRUE;

Generals/Code/GameEngine/Source/GameLogic/Object/Collide/CrateCollide/VeterancyCrateCollide.cpp

@@ -89,13 +89,13 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 	if (levelsToGain <= 0)
 		return false;
 
-	if (!other->isTrainable())
+	const ExperienceTracker *et = other->getExperienceTracker();
+	if( !et || !et->isTrainable() )
 	{
 		//If the other unit can't gain experience, then we can't help promote it!
 		return false;
 	}
 
-	const ExperienceTracker* et = other->getExperienceTracker();
 	if (!et || !et->canGainExpForLevel(levelsToGain))
 		return false;
 

Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp

@@ -2694,22 +2694,6 @@ VeterancyLevel Object::getVeterancyLevel() const
 	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR;
 }
 
-//-------------------------------------------------------------------------------------------------
-Bool Object::isTrainable() const
-{
-	const ExperienceTracker* expTracker = m_experienceTracker;
-
-#if !RETAIL_COMPATIBLE_CRC
-	if (m_contain)
-	{
-		if (const Object* rider = m_contain->friend_getRider())
-			expTracker = rider->getExperienceTracker();
-	}
-#endif
-
-	return expTracker && expTracker->isTrainable();
-}
-
 //-------------------------------------------------------------------------------------------------
 void Object::friend_bindToDrawable( Drawable *draw )
 {

GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h

@@ -232,7 +232,6 @@ class Object : public Thing, public Snapshot
 	ExperienceTracker* getExperienceTracker() {return m_experienceTracker;}
 	const ExperienceTracker* getExperienceTracker() const {return m_experienceTracker;}
 	VeterancyLevel getVeterancyLevel() const;
-	Bool isTrainable() const; ///< Can this unit - or its rider - gain veterancy?
 
 	inline const AsciiString& getName() const { return m_name; }
 	inline void setName( const AsciiString& newName ) { m_name = newName; }

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

@@ -4514,7 +4514,7 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 					continue;
 
 				ExperienceTracker *et = pObject->getExperienceTracker();
-				if (!et || !pObject->isTrainable())
+				if (!et || !et->isTrainable())
 					continue;
 
 				VeterancyLevel oldVet = et->getVeterancyLevel();

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

@@ -160,7 +160,7 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 		return FALSE;
 
 	// Sorry, you can't gain levels
-	if (!other->isTrainable())
+	if( !other->getExperienceTracker()->isTrainable() )
 		return FALSE;
 
 	return TRUE;

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

@@ -89,13 +89,13 @@ Bool VeterancyCrateCollide::isValidToExecute( const Object *other ) const
 	if (levelsToGain <= 0)
 		return false;
 
-	if (!other->isTrainable())
+	const ExperienceTracker *et = other->getExperienceTracker();
+	if( !et || !et->isTrainable() )
 	{
 		//If the other unit can't gain experience, then we can't help promote it!
 		return false;
 	}
 
-	const ExperienceTracker* et = other->getExperienceTracker();
 	if (!et || !et->canGainExpForLevel(levelsToGain))
 		return false;
 

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

@@ -2988,22 +2988,6 @@ VeterancyLevel Object::getVeterancyLevel() const
 	return m_experienceTracker ? m_experienceTracker->getVeterancyLevel() : LEVEL_REGULAR;
 }
 
-//-------------------------------------------------------------------------------------------------
-Bool Object::isTrainable() const
-{
-	const ExperienceTracker* expTracker = m_experienceTracker;
-
-#if !RETAIL_COMPATIBLE_CRC
-	if (m_contain && m_contain->isRiderChangeContain())
-	{
-		if (const Object* rider = m_contain->friend_getRider())
-			expTracker = rider->getExperienceTracker();
-	}
-#endif
-
-	return expTracker && expTracker->isTrainable();
-}
-
 //-------------------------------------------------------------------------------------------------
 void Object::friend_bindToDrawable( Drawable *draw )
 {