Torpedo Mechanics Integration

Author: IamInnocent3X

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

@@ -103,6 +103,9 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter
 	virtual Bool projectileShouldCollideWithWater() const override;
 	virtual Bool projectileShouldDetonateOnGround() const { return false; }
 	virtual void setShrapnelLaunchID(ObjectID shrapnelLaunchID) { m_shrapnelLaunchID = shrapnelLaunchID; }
+	virtual void friend_refreshUpdate() { refreshUpdate(); }
+
+	virtual void refreshUpdate() { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); }
 
 protected:
 

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

@@ -106,6 +106,9 @@ class FreeFallProjectileBehavior : public UpdateModule, public ProjectileUpdateI
 	virtual bool projectileShouldCollideWithWater() const override;
 	virtual Bool projectileShouldDetonateOnGround() const { return getFreeFallProjectileBehaviorModuleData()->m_detonateOnGround; }
 	virtual void setShrapnelLaunchID(ObjectID shrapnelLaunchID) { m_shrapnelLaunchID = shrapnelLaunchID; }
+	virtual void friend_refreshUpdate() { refreshUpdate(); }
+
+	virtual void refreshUpdate() { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); }
 
 protected:
 

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

@@ -121,6 +121,9 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa
 	virtual bool projectileShouldCollideWithWater() const override;
 	virtual Bool projectileShouldDetonateOnGround() const { return false; }
 	virtual void setShrapnelLaunchID(ObjectID shrapnelLaunchID) { m_shrapnelLaunchID = shrapnelLaunchID; }
+	virtual void friend_refreshUpdate() { refreshUpdate(); }
+
+	virtual void refreshUpdate() { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); }
 
 	virtual Bool processCollision(PhysicsBehavior *physics, Object *other); ///< Returns true if the physics collide should apply the force.  Normally not.  jba.
 

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

@@ -111,6 +111,9 @@ class NeutronMissileUpdate : public UpdateModule,
 	virtual const Coord3D* getTargetPosition();
 	virtual Bool projectileShouldDetonateOnGround() const { return TRUE; } // Yes, we should detonate on ground if we are aiming at a moving object
 	virtual void setShrapnelLaunchID(ObjectID shrapnelLaunchID) {}
+	virtual void friend_refreshUpdate() { refreshUpdate(); }
+
+	virtual void refreshUpdate() { setWakeFrame(getObject(), UPDATE_SLEEP_NONE); }
 
 	virtual UpdateSleepTime update();
 	virtual void onDelete( void );

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

@@ -280,6 +280,7 @@ class ProjectileUpdateInterface
 	virtual void setShrapnelLaunchID(ObjectID shrapnelLaunchID) = 0;
 	virtual Bool projectileShouldDetonateOnGround() const = 0;
 	virtual Bool projectileShouldCollideWithWater() const { return false; };
+	virtual void friend_refreshUpdate() = 0;
 
 	virtual Object* getTargetObject() = 0;
 	virtual const Coord3D* getTargetPosition() = 0;

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

@@ -850,6 +850,7 @@ class Object : public Thing, public Snapshot
 	void doObjectLocomotorUpdate();
 	void doSlowDeathLayerUpdate(Bool hitTree);
 	void doSlowDeathRefreshUpdate();
+	void doOverWaterUpdate();
 
 	void setIsMobMember(Bool set) { m_isMobMember = set; }
 	void setMobUpdateRefreshed(Bool set) { m_mobJustUpdated = set; }

GeneralsMD/Code/GameEngine/Source/Common/Thing/Thing.cpp

@@ -343,11 +343,15 @@ Real Thing::getHeightAboveTerrainOrWater() const
 		Real waterZ;
 		if (TheTerrainLogic->isUnderwater(pos->x, pos->y, &waterZ))
 		{
+			if(!m_cachedIsOverWater && AsObject(this))
+				AsObject(this)->doOverWaterUpdate();
 			m_cachedAltitudeAboveTerrainOrWater = pos->z - waterZ;
 			m_cachedIsOverWater = TRUE;
 		}
 		else
 		{
+			if(m_cachedIsOverWater && AsObject(this))
+				AsObject(this)->doOverWaterUpdate();
 			m_cachedAltitudeAboveTerrainOrWater = getHeightAboveTerrain();
 			m_cachedIsOverWater = FALSE;
 		}

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

@@ -9292,6 +9292,24 @@ void Object::doSlowDeathLayerUpdate(Bool hitTree)
 	}
 }
 
+
+//-------------------------------------------------------------------------------------------------
+void Object::doOverWaterUpdate()
+{
+	// Currently only torpedos needs update checks
+	if(!isKindOf(KINDOF_PROJECTILE))
+		return;
+
+	for (BehaviorModule** m = m_behaviors; *m; ++m)
+	{
+		ProjectileUpdateInterface *pui = (*m)->getProjectileUpdateInterface();
+		if( pui )
+		{
+			pui->friend_refreshUpdate();
+		}
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 Bool Object::isDozerDoingAnyTasks() const
 {

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/MissileAIUpdate.cpp

@@ -1076,7 +1076,7 @@ UpdateSleepTime MissileAIUpdate::update()
 	}
 
 	// If torpedo, update target location
-	if (d->m_isTorpedo && m_isTrackingTarget) {
+	if (d->m_isTorpedo && m_isTrackingTarget && !m_isJammed) {
 		Object * targetUnit = TheGameLogic->findObjectByID(m_victimID);
 		if (targetUnit != nullptr && !targetUnit->isEffectivelyDead()) {
 			Coord3D targetPos = *targetUnit->getPosition();
@@ -1278,7 +1278,8 @@ void MissileAIUpdate::airborneTargetGone()
 	// by the Weapon that fired me.  The safest thing for me to do in this state is to just run out of gas.
 
 	// IamInnocent - Added Missile retargeting if current target is gone
-	if(getMissileAIUpdateModuleData()->m_allowRetargeting)
+	const MissileAIUpdateModuleData* d = getMissileAIUpdateModuleData();
+	if(d->m_allowRetargeting)
 	{
 		Object *obj = getObject();
 		const Object *source = obj;
@@ -1303,7 +1304,7 @@ void MissileAIUpdate::airborneTargetGone()
 		filters[numFilters++] = &filterMapStatus;
 		filters[numFilters++] = &filterAlive;
 		filters[numFilters++] = &filterStealth;
-		if(!getMissileAIUpdateModuleData()->m_allowRetargetingThroughFog)
+		if(!d->m_allowRetargetingThroughFog)
 			filters[numFilters++] = &filterFogged;
 		filters[numFilters] = NULL;
 
@@ -1324,12 +1325,27 @@ void MissileAIUpdate::airborneTargetGone()
 			{
 				continue;
 			}
-			
-			getStateMachine()->setGoalPosition(curVictim->getPosition());
+
+			Coord3D targetPos = *curVictim->getPosition();
+			if (d->m_isTorpedo) {
+				Locomotor* curLoco = getCurLocomotor();
+				if (curLoco)
+				{
+					targetPos.z = getTorpedoTargetHeight(targetPos, curLoco);
+				}
+			}
+
+			getStateMachine()->setGoalPosition(&targetPos);
 			getStateMachine()->setGoalObject(curVictim);
-			aiMoveToObject(curVictim, CMD_FROM_AI );
-			m_originalTargetPos = *curVictim->getPosition();
-			m_isTrackingTarget = TRUE;
+			if (!d->m_isTorpedo) {
+				aiMoveToObject(curVictim, CMD_FROM_AI);
+			}
+			else {
+				aiMoveToPosition(&targetPos, CMD_FROM_AI);
+			}
+			m_originalTargetPos = targetPos;
+			m_isTrackingTarget = TRUE;// Remember that I was originally shot at a moving object, so if the 
+			// target dies I can do something cool.
 			m_victimID = curVictim->getID();
 
 			return;