Add exhaust for DumbProjectileBehavior

Add fix for FXList groundHeight

Author: Andreas-W

GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h

@@ -39,6 +39,7 @@
 #include "WWMath/matrix3d.h"
 
 class ParticleSystem;
+enum ParticleSystemID CPP_11(: Int);
 class FXList;
 
 
@@ -120,11 +121,16 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter
 	Int										m_currentFlightPathStep;	///< Our current index in the flight path vector.  Quicker than popping off.
 	WeaponBonusConditionFlags		m_extraBonusFlags;
 
+	const ParticleSystemTemplate* m_exhaustSysTmpl;
+	ParticleSystemID			m_exhaustID;
+
   Bool                  m_hasDetonated;           ///<
 
 	Bool calcFlightPath(Bool recalcNumSegments);
 #if defined(RTS_DEBUG)
 	void displayFlightPath();	///< Uses little debug icons in worldspace to show the path chosen when it is decided upon
 #endif
 
+	void tossExhaust();
+
 };

GeneralsMD/Code/GameEngine/Source/GameClient/FXList.cpp

@@ -827,15 +827,15 @@ class ParticleSystemFXNugget : public FXNugget
 						if (!isValidSurface(primary, &info))
 							continue;
 
-						refHeight = needWaterCheck ? info.m_waterHeight : info.m_groundHeight;
+						refHeight = surfaceInfo->m_isWater ? info.m_waterHeight : info.m_groundHeight;
 					}
 
 					if (m_createAtGroundHeight) {
 						if (needExactCheck) {
 							newPos.z = refHeight + offset.z + m_height.getValue();
 						}
 						else {
-							refHeight = needWaterCheck ? surfaceInfo->m_waterHeight : surfaceInfo->m_groundHeight;
+							refHeight = surfaceInfo->m_isWater ? surfaceInfo->m_waterHeight : surfaceInfo->m_groundHeight;
 							newPos.z = refHeight + offset.z + m_height.getValue();
 						}
 					}

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

@@ -36,6 +36,7 @@
 #include "Common/RandomValue.h"
 #include "Common/Xfer.h"
 #include "GameClient/Drawable.h"
+#include "GameClient/ParticleSys.h"
 #include "GameClient/FXList.h"
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Object.h"
@@ -126,13 +127,16 @@ DumbProjectileBehavior::DumbProjectileBehavior( Thing *thing, const ModuleData*
 	m_flightPathEnd.zero();
 	m_currentFlightPathStep = 0;
 	m_extraBonusFlags = 0;
+	m_exhaustSysTmpl = nullptr;
+	m_exhaustID = INVALID_PARTICLE_SYSTEM_ID;
 
   m_hasDetonated = FALSE;
 }
 
 //-------------------------------------------------------------------------------------------------
 DumbProjectileBehavior::~DumbProjectileBehavior()
 {
+	 tossExhaust();
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -324,6 +328,16 @@ static Bool calcTrajectory(
 
 #endif // NOT_IN_USE
 
+//-------------------------------------------------------------------------------------------------
+void DumbProjectileBehavior::tossExhaust()
+{
+	if (m_exhaustID != INVALID_PARTICLE_SYSTEM_ID)
+	{
+		TheParticleSystemManager->destroyParticleSystemByID(m_exhaustID);
+		m_exhaustID = INVALID_PARTICLE_SYSTEM_ID;
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 // Prepares the missile for launch via proper weapon-system channels.
 //-------------------------------------------------------------------------------------------------
@@ -407,6 +421,12 @@ void DumbProjectileBehavior::projectileFireAtObjectOrPosition( const Object *vic
 		return;
 	}
 	m_currentFlightPathStep = 0;// We are at the first point, because the launching put us there
+
+	m_exhaustSysTmpl = exhaustSysOverride;
+	if (m_exhaustSysTmpl != nullptr)
+	{
+		m_exhaustID = TheParticleSystemManager->createAttachedParticleSystemID(m_exhaustSysTmpl, getObject());
+	}
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -845,6 +865,18 @@ void DumbProjectileBehavior::xfer( Xfer *xfer )
 
 	}
 
+	AsciiString exhaustName;
+	if (m_exhaustSysTmpl)
+	{
+		exhaustName = m_exhaustSysTmpl->getName();
+	}
+	xfer->xferAsciiString(&exhaustName);
+	if (exhaustName.isNotEmpty() && m_exhaustSysTmpl == nullptr)
+	{
+		m_exhaustSysTmpl = TheParticleSystemManager->findTemplate(exhaustName);
+	}
+
+
 	// lifespan frame
 	xfer->xferUnsignedInt( &m_lifespanFrame );