unify(commandxlat): Merge CommandXlat and related code from Zero Hour (TheSuperHackers#2765)

Author: xezon

Generals/Code/GameEngine/Include/GameClient/CommandXlat.h

@@ -50,13 +50,13 @@ class CommandTranslator : public GameMessageTranslator
 	Int m_objective;
 	Bool m_teamExists;				///< is there a currently selected "team"?
 
- 	// these are for determining if a drag occurred or it was just a sloppy click
- 	ICoord2D m_mouseRightDragAnchor;		// the location of a possible mouse drag start
- 	ICoord2D m_mouseRightDragLift;			// the location of a possible mouse drag end
- 	UnsignedInt m_mouseRightDown;	// when the mouse down happened
- 	UnsignedInt m_mouseRightUp;		// when the mouse up happened
+	// these are for determining if a drag occurred or it was just a sloppy click
+	ICoord2D m_mouseRightDragAnchor;		// the location of a possible mouse drag start
+	ICoord2D m_mouseRightDragLift;			// the location of a possible mouse drag end
+	UnsignedInt m_mouseRightDown;	// when the mouse down happened
+	UnsignedInt m_mouseRightUp;		// when the mouse up happened
 
-  	GameMessage::Type createMoveToLocationMessage( Drawable *draw, const Coord3D *dest, CommandEvaluateType commandType );
+	GameMessage::Type createMoveToLocationMessage( Drawable *draw, const Coord3D *dest, CommandEvaluateType commandType );
 	GameMessage::Type createAttackMessage( Drawable *draw, Drawable *other, CommandEvaluateType commandType );
 	GameMessage::Type createEnterMessage( Drawable *enter, CommandEvaluateType commandType );
 	GameMessage::Type issueMoveToLocationCommand( const Coord3D *pos, Drawable *drawableInWay, CommandEvaluateType commandType );

Generals/Code/GameEngine/Include/GameClient/InGameUI.h

@@ -342,6 +342,7 @@ friend class Drawable;	// for selection/deselection transactions
 		ACTIONTYPE_MAKE_DEFECTOR,
 		ACTIONTYPE_SET_RALLY_POINT,
 		ACTIONTYPE_COMBATDROP_INTO,
+		ACTIONTYPE_SABOTAGE_BUILDING,
 
 		NUM_ACTIONTYPES
 	};
@@ -538,10 +539,12 @@ friend class Drawable;	// for selection/deselection transactions
 	void setCameraRotateRight( Bool set )		{ m_cameraRotatingRight = set; }
 	void setCameraZoomIn( Bool set )				{ m_cameraZoomingIn = set; }
 	void setCameraZoomOut( Bool set )				{ m_cameraZoomingOut = set; }
+  void setCameraTrackingDrawable( Bool set ) { m_cameraTrackingDrawable = set; }
 	Bool isCameraRotatingLeft() const { return m_cameraRotatingLeft; }
 	Bool isCameraRotatingRight() const { return m_cameraRotatingRight; }
 	Bool isCameraZoomingIn() const { return m_cameraZoomingIn; }
 	Bool isCameraZoomingOut() const { return m_cameraZoomingOut; }
+  Bool isCameraTrackingDrawable() const { return m_cameraTrackingDrawable; }
 	void resetCamera();
 
 	virtual void addIdleWorker( Object *obj );
@@ -586,6 +589,9 @@ friend class Drawable;	// for selection/deselection transactions
 	void registerWindowLayout(WindowLayout *layout); // register a layout for updates
 	void unregisterWindowLayout(WindowLayout *layout); // stop updates for this layout
 
+  void triggerDoubleClickAttackMoveGuardHint();
+
+
 public:
 	// World 2D animation methods
 	void addWorldAnimation( Anim2DTemplate *animTemplate,
@@ -647,7 +653,7 @@ friend class Drawable;	// for selection/deselection transactions
 	struct MilitarySubtitleData
 	{
 		UnicodeString subtitle;										///< The complete subtitle to be drawn, each line is separated by L"\n"
-		UnsignedInt index;												///< the current index that we are at through the sibtitle
+		UnsignedInt index;												///< the current index that we are at through the subtitle
 		ICoord2D position;												///< Where on the screen the subtitle should be drawn
 		DisplayString *displayStrings[MAX_SUBTITLE_LINES];	///< We'll only allow MAX_SUBTITLE_LINES worth of display strings
 		UnsignedInt currentDisplayString;					///< contains the current display string we're on. (also lets us know the last display string allocated
@@ -726,6 +732,8 @@ friend class Drawable;	// for selection/deselection transactions
 	Int													m_maxSelectCount;												///< Max number of objects to select
 	UnsignedInt									m_frameSelectionChanged;								///< Frame when the selection last changed.
 
+  Int                         m_duringDoubleClickAttackMoveGuardHintTimer; ///< Frames left to draw the doubleClickFeedbackTimer
+  Coord3D                     m_duringDoubleClickAttackMoveGuardHintStashedPosition;
 
 	// Video playback data
 	VideoBuffer*								m_videoBuffer;			///< video playback buffer
@@ -930,6 +938,7 @@ friend class Drawable;	// for selection/deselection transactions
 	Bool												m_cameraRotatingLeft;
 	Bool 												m_cameraRotatingRight;
 	Bool 												m_cameraZoomingIn;
+	Bool 												m_cameraTrackingDrawable;
 	Bool 												m_cameraZoomingOut;
 
 	Bool												m_drawRMBScrollAnchor;

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

@@ -113,6 +113,9 @@ class GameLogic : public SubsystemInterface, public Snapshot
 
 	void preUpdate();
 
+#if defined(RTS_DEBUG)
+	Int getNumberSleepyUpdates() const {return m_sleepyUpdates.size();} //For profiling, so not in Release.
+#endif
 	void processCommandList( CommandList *list );		///< process the command list
 
 	void prepareNewGame( GameMode gameMode, GameDifficulty diff, Int rankPoints );						///< prepare for new game

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

@@ -165,6 +165,7 @@ class ContainModuleInterface
 	virtual PlayerMaskType getPlayerWhoEntered() const = 0;
 
 	virtual void processDamageToContained(Real percentDamage) = 0; ///< Do our % damage to units now.
+  virtual Object* getClosestRider ( const Coord3D *pos ) = 0;
 
 	virtual void enableLoadSounds( Bool enable ) = 0;
 

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

@@ -211,6 +211,7 @@ class OpenContain : public UpdateModule,
 
 	virtual void enableLoadSounds( Bool enable ) override { m_loadSoundsEnabled = enable; }
 
+  virtual Object* getClosestRider ( const Coord3D *pos ) override;
 protected:
 
 	virtual void monitorConditionChanges();				///< check to see if we need to update our occupant postions from a model change or anything else

Generals/Code/GameEngine/Source/Common/Thing/ThingTemplate.cpp

@@ -94,6 +94,12 @@ static void parseKindOfFromINI(INI* ini, void* instance, void *store, const void
 		// KINDOF_AIRFIELD became KINDOF_FS_AIRFIELD in Zero Hour.
 		kindOf->set(KINDOF_FS_AIRFIELD);
 	}
+
+	if (kindOf->test(KINDOF_DRONE))
+	{
+		// KINDOF_DRONE was implicitly KINDOF_NO_SELECT in Generals.
+		kindOf->set(KINDOF_NO_SELECT);
+	}
 #endif
 }
 

Generals/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -1026,6 +1026,8 @@ InGameUI::InGameUI()
 	m_nextMoveHint = 0;
 	m_selectCount = 0;
 	m_frameSelectionChanged = 0;
+  m_duringDoubleClickAttackMoveGuardHintTimer = 0;
+  m_duringDoubleClickAttackMoveGuardHintStashedPosition.zero();
 	m_maxSelectCount = -1;
 	m_isScrolling = FALSE;
 	m_isSelecting = FALSE;
@@ -1489,11 +1491,31 @@ void InGameUI::handleRadiusCursor()
 		if( !rts::localPlayerHasRadar()  ||  (TheRadar->screenPixelToWorld( &mouseIO->pos, &pos ) == FALSE) )// if radar off, or point not on radar
 			TheTacticalView->screenToTerrain( &mouseIO->pos, &pos );
 
-		m_curRadiusCursor.setPosition(pos);	//world space position of center of decal
-		m_curRadiusCursor.update();
-	}
+
+    if ( TheGlobalData->m_doubleClickAttackMove && m_duringDoubleClickAttackMoveGuardHintTimer > 0 )
+    {
+      m_curRadiusCursor.setOpacity( m_duringDoubleClickAttackMoveGuardHintTimer * 0.1f );
+  		m_curRadiusCursor.setPosition( m_duringDoubleClickAttackMoveGuardHintStashedPosition );	//world space position of center of decal
+
+    }
+    else
+    {
+  		m_curRadiusCursor.setPosition(pos);	//world space position of center of decal
+      m_curRadiusCursor.update();
+    }
+
+  }
+}
+
+
+void InGameUI::triggerDoubleClickAttackMoveGuardHint()
+{
+  m_duringDoubleClickAttackMoveGuardHintTimer = 11;
+	const MouseIO* mouseIO = TheMouse->getMouseStatus();
+	TheTacticalView->screenToTerrain( &mouseIO->pos, &m_duringDoubleClickAttackMoveGuardHintStashedPosition );
 }
 
+
 //-------------------------------------------------------------------------------------------------
 /** Handle the placement "icons" that appear at the cursor when we're putting down a
 	* structure to build.  Note that this has additional logic to also show a line
@@ -2788,6 +2810,24 @@ void InGameUI::createCommandHint( const GameMessage *msg )
 	}
 //#endif
 
+
+	setRadiusCursorNone();
+  if ( TheGlobalData->m_doubleClickAttackMove )
+  {
+    if ( --m_duringDoubleClickAttackMoveGuardHintTimer > 0 )
+    {
+      setMouseCursor(Mouse::FORCE_ATTACK_GROUND);
+		  setRadiusCursor(RADIUSCURSOR_GUARD_AREA,
+										  nullptr,
+										  PRIMARY_WEAPON);
+      return;
+    }
+  }
+
+
+
+
+
 	// set cursor to normal if there is a window under the cursor
 	GameWindow *window = nullptr;
 	const MouseIO *io = TheMouse->getMouseStatus();