bugfix(object): Reward unit experience for kills caused by OCL objects (#1634)

Author: Stubbjax

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

@@ -58,6 +58,7 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Bool canGainExpForLevel(Int levelsToGain) const;															///< return same value as gainExpForLevel, but don't change anything
 	void setExperienceAndLevel(Int experienceIn, Bool provideFeedback = TRUE );
 	void setExperienceSink( ObjectID sink );											///< My experience actually goes to this person (loose couple)
+	ObjectID getExperienceSink() const;
 
 	Real getExperienceScalar() const { return m_experienceScalar; }
 	void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; }

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

@@ -80,6 +80,12 @@ void ExperienceTracker::setExperienceSink( ObjectID sink )
 	m_experienceSink = sink;
 }
 
+//-------------------------------------------------------------------------------------------------
+ObjectID ExperienceTracker::getExperienceSink() const
+{
+	return m_experienceSink;
+}
+
 //-------------------------------------------------------------------------------------------------
 // Set Level to AT LEAST this... if we are already >= this level, do nothing.
 void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback )

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

@@ -1333,6 +1333,11 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			}
 		}
 
+#if !RETAIL_COMPATIBLE_CRC && !RETAIL_COMPATIBLE_BUG
+		ObjectID sinkID = sourceObj->getExperienceTracker()->getExperienceSink();
+		firstObject->getExperienceTracker()->setExperienceSink(sinkID != INVALID_ID ? sinkID : sourceObj->getID());
+#endif
+
 		if (container)
 			doStuffToObj( container, AsciiString::TheEmptyString, pos, mtx, orientation, sourceObj, lifetimeFrames );
 

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

@@ -58,6 +58,7 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot
 	Bool canGainExpForLevel(Int levelsToGain) const;															///< return same value as gainExpForLevel, but don't change anything
 	void setExperienceAndLevel(Int experienceIn, Bool provideFeedback = TRUE );
 	void setExperienceSink( ObjectID sink );											///< My experience actually goes to this person (loose couple)
+	ObjectID getExperienceSink() const;
 
 	Real getExperienceScalar() const { return m_experienceScalar; }
 	void setExperienceScalar( Real scalar ) { m_experienceScalar = scalar; }

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

@@ -80,6 +80,12 @@ void ExperienceTracker::setExperienceSink( ObjectID sink )
 	m_experienceSink = sink;
 }
 
+//-------------------------------------------------------------------------------------------------
+ObjectID ExperienceTracker::getExperienceSink() const
+{
+	return m_experienceSink;
+}
+
 //-------------------------------------------------------------------------------------------------
 // Set Level to AT LEAST this... if we are already >= this level, do nothing.
 void ExperienceTracker::setMinVeterancyLevel( VeterancyLevel newLevel, Bool provideFeedback )

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

@@ -1421,6 +1421,11 @@ class GenericObjectCreationNugget : public ObjectCreationNugget
 			}
 		}
 
+#if !RETAIL_COMPATIBLE_CRC && !RETAIL_COMPATIBLE_BUG
+		ObjectID sinkID = sourceObj->getExperienceTracker()->getExperienceSink();
+		firstObject->getExperienceTracker()->setExperienceSink(sinkID != INVALID_ID ? sinkID : sourceObj->getID());
+#endif
+
 		if (container)
 			doStuffToObj( container, AsciiString::TheEmptyString, pos, mtx, orientation, sourceObj, lifetimeFrames );