refactor: Abstract conditions into an object function

Author: Stubbjax

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

@@ -216,6 +216,7 @@ 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 || !et->isTrainable())
+				if (!et || !pObject->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->getExperienceTracker()->isTrainable() )
+	if (!other->isTrainable())
 		return FALSE;
 
 	return TRUE;

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

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

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

@@ -2694,6 +2694,22 @@ 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,6 +232,7 @@ 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

@@ -4513,22 +4513,8 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				if (!pObject)
 					continue;
 
-				ExperienceTracker* et;
-				Bool isRiderTrainable = true;
-
-				// TheSuperHackers @bugfix Stubbjax 10/12/2025 Do not allow ranking if the rider is not trainable.
-				const ContainModuleInterface* contain = pObject->getContain();
-				if (contain && contain->isRiderChangeContain())
-				{
-					if (Object* rider = (Object*)contain->friend_getRider())
-					{
-						et = rider->getExperienceTracker();
-						isRiderTrainable = et && et->isTrainable();
-					}
-				}
-
-				et = pObject->getExperienceTracker();
-				if (!et || !isRiderTrainable || !et->isTrainable())
+				ExperienceTracker *et = pObject->getExperienceTracker();
+				if (!et || !pObject->isTrainable())
 					continue;
 
 				VeterancyLevel oldVet = et->getVeterancyLevel();

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

@@ -42,7 +42,6 @@
 #include "GameClient/GameText.h"
 #include "GameClient/InGameUI.h"
 #include "GameLogic/ExperienceTracker.h"
-#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Object.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -161,23 +160,9 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 		return FALSE;
 
 	// Sorry, you can't gain levels
-	if( !other->getExperienceTracker()->isTrainable() )
+	if (!other->isTrainable())
 		return FALSE;
 
-#if !RETAIL_COMPATIBLE_CRC
-	// TheSuperHackers @bugfix Stubbjax 10/12/2025 Do not allow ranking if the rider is not trainable.
-	const ContainModuleInterface* contain = other->getContain();
-	if (contain && contain->isRiderChangeContain())
-	{
-		if (Object* rider = (Object*)contain->friend_getRider())
-		{
-			const ExperienceTracker* et = rider->getExperienceTracker();
-			if (!et || !et->isTrainable())
-				return FALSE;
-		}
-	}
-#endif
-
 	return TRUE;
 }
 

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

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

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

@@ -2988,6 +2988,22 @@ 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 )
 {