bugfix: Prevent ranking of riders that are not trainable

Author: Stubbjax

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

@@ -4513,8 +4513,21 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 				if (!pObject)
 					continue;
 
-				ExperienceTracker *et = pObject->getExperienceTracker();
-				if (!et || !et->isTrainable())
+				ExperienceTracker* et;
+				Bool isRiderTrainable = true;
+
+				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())
 					continue;
 
 				VeterancyLevel oldVet = et->getVeterancyLevel();

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

@@ -42,6 +42,7 @@
 #include "GameClient/GameText.h"
 #include "GameClient/InGameUI.h"
 #include "GameLogic/ExperienceTracker.h"
+#include "GameLogic/Module/ContainModule.h"
 #include "GameLogic/Object.h"
 
 //-------------------------------------------------------------------------------------------------
@@ -163,6 +164,19 @@ Bool SalvageCrateCollide::eligibleForLevel( Object *other )
 	if( !other->getExperienceTracker()->isTrainable() )
 		return FALSE;
 
+#if !RETAIL_COMPATIBLE_CRC
+	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;
 }