fixed water DieModule check

Author: pWn3d1337

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

@@ -37,12 +37,11 @@
 #include "GameLogic/GameLogic.h"
 #include "GameLogic/Module/DieModule.h"
 #include "GameLogic/Object.h"
-#include <GameLogic/TerrainLogic.h>
-
-
-
+#include "GameLogic/TerrainLogic.h"
 
 
+// Way higher than map size will allow
+constexpr Real defaultMaxWaterDepth {10000.0};
 
 //-------------------------------------------------------------------------------------------------
 DieMuxData::DieMuxData() {
@@ -53,7 +52,7 @@ DieMuxData::DieMuxData() {
 		m_deathTypes &= ~TheGlobalData->m_defaultExcludedDeathTypes;
 	}
 	m_minWaterDepth = 0.0f;
-	m_maxWaterDepth = std::numeric_limits<Real>::infinity();
+	m_maxWaterDepth = defaultMaxWaterDepth;
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -92,9 +91,9 @@ Bool DieMuxData::isDieApplicable(const Object* obj, const DamageInfo *damageInfo
 	if( m_requiredStatus.any()  &&  !obj->getStatusBits().testForAll( m_requiredStatus ) )
 		return false;
 
-	if ((m_minWaterDepth > 0.0f || m_maxWaterDepth < std::numeric_limits<Short>::infinity()) && obj != nullptr) {
+	if ((m_minWaterDepth > 0.0f || m_maxWaterDepth < defaultMaxWaterDepth) && obj != nullptr) {
 
-		// if on bride and we need water -> not applicable
+		// if on bridge and we need water -> not applicable
 		if (obj->getLayer() > LAYER_GROUND && m_minWaterDepth > 0.0f) {
 			return false;
 		}

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

@@ -157,7 +157,19 @@ ShipSlowDeathBehaviorModuleData::ShipSlowDeathBehaviorModuleData( void )
 ShipSlowDeathBehavior::ShipSlowDeathBehavior( Thing *thing, const ModuleData *moduleData )
 													: SlowDeathBehavior( thing, moduleData )
 {
-
+	m_deathSound = AudioEventRTS();
+	m_initStartFrame = 0;
+	m_toppleStartFrame = 0;
+	m_sinkStartFrame = 0;
+	m_shipSinkStarted = false;
+	m_chosenToppleType = 0;
+
+	m_toppleVarianceRoll = 0.0f;
+
+	m_curPitch = 0.0f;
+	m_curYaw = 0.0f;
+	m_curRoll = 0.0f;
+	m_curZ = 0.0f;
 }
 
 //-------------------------------------------------------------------------------------------------