FXList fixes

Author: Andreas-W

Core/GameEngineDevice/Source/W3DDevice/GameClient/Drawable/Draw/W3DModelDraw.cpp

@@ -1049,6 +1049,10 @@ W3DModelDrawModuleData::W3DModelDrawModuleData() :
 
   m_receivesDynamicLights = TRUE;
 
+	m_ignoreAnimScaling = FALSE;
+	m_ignoreRotation = FALSE;
+	m_showForOwnerOnly = FALSE;
+
 	// m_ignoreConditionStates defaults to all zero, which is what we want
 }
 

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

@@ -116,7 +116,7 @@ class DelayedUpgradeBehavior : public UpdateModule, public UpgradeMux
 
 	void triggerUpgrade();
 
-	virtual Bool resetUpgrade(UpgradeMaskType keyMask);  // When this upgrade is removed, we reset our triggers.
+	virtual Bool resetUpgrade(const UpgradeMaskType& keyMask);  // When this upgrade is removed, we reset our triggers.
 
 	virtual void upgradeImplementation();
 

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

@@ -698,6 +698,7 @@ class ParticleSystemFXNugget : public FXNugget
 		m_minAllowedHeight = -INFINITY;
 		// m_createAtWaterHeight = FALSE;
 		m_allowedSurfaceType = SURFACE_ALL;
+		m_useSurfaceInfo = FALSE;
 	}
 
 	virtual void doFXPos(const Coord3D *primary, const Matrix3D* primaryMtx, const Real /*primarySpeed*/, const Coord3D * /*secondary*/, const Real overrideRadius, FXSurfaceInfo* surfaceInfo) const
@@ -1072,11 +1073,13 @@ void FXList::doFXObj(const Object* primary, const Object* secondary) const
 	if (primary && primary->getShroudedStatus(playerIndex) > OBJECTSHROUD_PARTIAL_CLEAR)
 		return;	//the primary object is fogged or shrouded so don't bother with the effect.
 
+	FXSurfaceInfo surfaceInfo;  // Cached water/height
+
 	for (FXNuggetList::const_iterator it = m_nuggets.begin(); it != m_nuggets.end(); ++it)
 	{
 
 		// HERE THE PRIMARY IS THE GUY RECEIVING THE FX, AND SECONDARY MIGHT BE THE GUY DEALING IT
-		(*it)->doFXObj(primary, secondary);
+		(*it)->doFXObj(primary, secondary, &surfaceInfo);
 	}
 }
 

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

@@ -202,9 +202,9 @@ void DelayedUpgradeBehavior::triggerUpgrade(void)
 
 //-------------------------------------------------------------------------------------------------
 //-------------------------------------------------------------------------------------------------
-Bool DelayedUpgradeBehavior::resetUpgrade(UpgradeMaskType keyMask)
+Bool DelayedUpgradeBehavior::resetUpgrade(const UpgradeMaskType& keyMask)
 {
-	// DEBUG_LOG(("DelayedUpgradeBehavior::resetUpgrade()."));
+	DEBUG_LOG(("DelayedUpgradeBehavior::resetUpgrade()."));
 	if (UpgradeMux::resetUpgrade(keyMask)) {
 		m_triggerCompleted = FALSE;
 		m_triggerFrame = 0;