[GEN] Backport SpecialPowerUpdate changes from Zero Hour (#791)

Author: tomsons26

Generals/Code/GameEngine/CMakeLists.txt

@@ -391,6 +391,7 @@ set(GAMEENGINE_SRC
     Include/GameLogic/Module/SpecialPowerCompletionDie.h
     Include/GameLogic/Module/SpecialPowerCreate.h
     Include/GameLogic/Module/SpecialPowerModule.h
+    Include/GameLogic/Module/SpecialPowerUpdateModule.h
     Include/GameLogic/Module/SpyVisionSpecialPower.h
     Include/GameLogic/Module/SpyVisionUpdate.h
     Include/GameLogic/Module/SquishCollide.h

Generals/Code/GameEngine/Include/Common/GameType.h

@@ -58,6 +58,8 @@ enum FormationID CPP_11(: Int)
 	FORCE_FORMATIONID_TO_LONG_SIZE = 0x7ffffff
 };
 
+#define INVALID_ANGLE -100.0f
+
 class INI;
 
 //-------------------------------------------------------------------------------------------------

Generals/Code/GameEngine/Include/Common/SpecialPower.h

@@ -123,6 +123,7 @@ class SpecialPowerTemplate : public Overridable
 	UnsignedInt getViewObjectDuration( void ) const { return getFO()->m_viewObjectDuration; }
 	Real getViewObjectRange( void ) const { return getFO()->m_viewObjectRange; }
 	Real getRadiusCursorRadius() const { return getFO()->m_radiusCursorRadius; }
+	Bool isShortcutPower() const { return getFO()->m_shortcutPower; }
 
 private: 
 
@@ -142,6 +143,7 @@ class SpecialPowerTemplate : public Overridable
 	Real							m_radiusCursorRadius;	///< size of radius cursor, if any
 	Bool							m_publicTimer;				///< display a countdown timer for this special power for all to see
 	Bool							m_sharedNSync;				///< If true, this is a special that is shared between all of a player's command centers
+	Bool							m_shortcutPower;		///< Is this shortcut power capable of being fired by the side panel?
 
 	static const FieldParse m_specialPowerFieldParse[];		///< the parse table
 

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

@@ -892,7 +892,7 @@ class AIGroup : public MemoryPoolObject, public Snapshot
 	void groupHackInternet( CommandSourceType cmdSource );				///< Begin hacking the internet for free cash from the heavens.
 	void groupDoSpecialPower( UnsignedInt specialPowerID, UnsignedInt commandOptions );
 	void groupDoSpecialPowerAtObject( UnsignedInt specialPowerID, Object *object, UnsignedInt commandOptions ); 
-	void groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const Coord3D *location, const Object *object, UnsignedInt commandOptions );
+	void groupDoSpecialPowerAtLocation( UnsignedInt specialPowerID, const Coord3D *location, Real angle, const Object *object, UnsignedInt commandOptions );
 #ifdef ALLOW_SURRENDER
 	void groupSurrender( const Object *objWeSurrenderedTo, Bool surrender, CommandSourceType cmdSource );
 #endif

Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h

@@ -80,7 +80,7 @@ class BaikonurLaunchPower : public SpecialPowerModule
 	BaikonurLaunchPower( Thing *thing, const ModuleData *moduleData );
 
 	virtual void doSpecialPower( UnsignedInt commandOptions );
-	virtual void doSpecialPowerAtLocation( const Coord3D *loc, UnsignedInt commandOptions );
+	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 
 protected:
 

Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h

@@ -34,7 +34,7 @@
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Common/KindOf.h"
-#include "GameLogic/Module/UpdateModule.h"
+#include "GameLogic/Module/SpecialPowerUpdateModule.h"
 
 // FORWARD REFERENCES /////////////////////////////////////////////////////////////////////////////
 class SpecialPowerModule;
@@ -137,12 +137,13 @@ class BattlePlanUpdate : public UpdateModule, public SpecialPowerUpdateInterface
 	// virtual destructor prototype provided by memory pool declaration
 
 	// SpecialPowerUpdateInterface
-	virtual void initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, UnsignedInt commandOptions, Int locationCount );
+	virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions );
 	virtual Bool isSpecialAbility() const { return false; }
 	virtual Bool isSpecialPower() const { return true; }
 	virtual Bool isActive() const {return m_status != TRANSITIONSTATUS_IDLE;}
 	virtual SpecialPowerUpdateInterface* getSpecialPowerUpdateInterface() { return this; }
-	virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; }
+	virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const { return false; } //Is it active now?
+	virtual Bool doesSpecialPowerHaveOverridableDestination() const { return false; }	//Does it have it, even if it's not active?
 	virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) {}
 	virtual Bool isPowerCurrentlyInUse( const CommandButton *command = NULL ) const;
 

Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h

@@ -78,7 +78,7 @@ class CashHackSpecialPower : public SpecialPowerModule
 	// virtual destructor provided by memory pool object
 
 	virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions );
-	virtual void doSpecialPowerAtLocation( const Coord3D *loc, UnsignedInt commandOptions );
+	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 
 protected:
 

Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h

@@ -73,7 +73,7 @@ class CleanupAreaPower : public SpecialPowerModule
 	CleanupAreaPower( Thing *thing, const ModuleData* moduleData );
 	// virtual destructor prototype defined by MemoryPoolObject
 
-	virtual void doSpecialPowerAtLocation( const Coord3D *loc, UnsignedInt commandOptions );
+	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 };
 
 #endif 

Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h

@@ -76,7 +76,7 @@ class DefectorSpecialPower : public SpecialPowerModule
 	// virtual destructor prototype provided by memory pool object
 
 	virtual void doSpecialPowerAtObject( Object *obj, UnsignedInt commandOptions );
-	virtual void doSpecialPowerAtLocation( const Coord3D *loc, UnsignedInt commandOptions );
+	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 
 protected:
 

Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h

@@ -75,7 +75,7 @@ class DemoralizeSpecialPower : public SpecialPowerModule
 	// virtual destructor prototype provided by memory pool object
 
 	virtual void doSpecialPowerAtObject( const Object *obj, UnsignedInt commandOptions );
-	virtual void doSpecialPowerAtLocation( const Coord3D *loc, UnsignedInt commandOptions );
+	virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions );
 
 protected: