unify(client): Merge DisplayString, GameText, GlobalLanguage, SelectionInfo code (#2337)

Author: xezon

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

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals Zero Hour(tm)
+**	Command & Conquer Generals(tm)
 **	Copyright 2025 TheSuperHackers
 **
 **	This program is free software: you can redistribute it and/or modify

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

@@ -90,6 +90,7 @@ class GlobalLanguage : public SubsystemInterface
 	AsciiString m_unicodeFontFileName;
 	Bool m_useHardWrap;
 	Int m_militaryCaptionSpeed;
+	Int m_militaryCaptionDelayMS;
 	FontDesc	m_copyrightFont;
 	FontDesc	m_messageFont;
 	FontDesc	m_militaryCaptionTitleFont;

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

@@ -64,6 +64,8 @@ struct PickDrawableStruct
 {
 	// List to fill with Drawables. This should be provided by the caller.
 	DrawableList *drawableListToFill;
+
+	Bool isPointSelection;
 	Bool forceAttackMode;
 
 	// Note, this is OR'd with the things we are attempting to select.

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

@@ -1,5 +1,5 @@
 /*
-**	Command & Conquer Generals Zero Hour(tm)
+**	Command & Conquer Generals(tm)
 **	Copyright 2025 TheSuperHackers
 **
 **	This program is free software: you can redistribute it and/or modify

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

@@ -136,7 +136,7 @@ void DisplayString::removeLastChar( void )
 // DisplayString::truncateBy ==================================================
 /** Remove the last charCount characters from the string text */
 //=============================================================================
-void DisplayString::truncateBy(const Int charCount)
+void DisplayString::truncateBy( const Int charCount )
 {
 	m_textString.truncateBy(charCount);
 
@@ -148,8 +148,8 @@ void DisplayString::truncateBy(const Int charCount)
 // DisplayString::truncateTo ==================================================
 /** Remove the last characters from the string text so it's at the most
 	* maxLength characters long */
-	//=============================================================================
-void DisplayString::truncateTo(const Int maxLength)
+//=============================================================================
+void DisplayString::truncateTo( const Int maxLength )
 {
 	m_textString.truncateTo(maxLength);
 

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

@@ -87,6 +87,7 @@ static const FieldParse TheGlobalLanguageDataFieldParseTable[] =
 	{ "CopyrightFont",					GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_copyrightFont ) },
 	{ "MessageFont",					GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_messageFont) },
 	{ "MilitaryCaptionTitleFont",		GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_militaryCaptionTitleFont) },
+	{ "MilitaryCaptionDelayMS",					INI::parseInt,					nullptr,		offsetof( GlobalLanguage, m_militaryCaptionDelayMS ) },
 	{ "MilitaryCaptionFont",			GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_militaryCaptionFont) },
 	{ "SuperweaponCountdownNormalFont",	GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_superweaponCountdownNormalFont) },
 	{ "SuperweaponCountdownReadyFont",	GlobalLanguage::parseFontDesc,	nullptr,	offsetof( GlobalLanguage, m_superweaponCountdownReadyFont) },
@@ -128,6 +129,7 @@ GlobalLanguage::GlobalLanguage()
 	m_useHardWrap = FALSE;
 	m_resolutionFontSizeAdjustment = 0.7f;
 	m_resolutionFontSizeMethod = ResolutionFontSizeMethod_Default;
+	m_militaryCaptionDelayMS = 750;
 
 	m_userResolutionFontSizeAdjustment = -1.0f;
 }
@@ -152,7 +154,7 @@ void GlobalLanguage::init( void )
 
 		INI ini;
 		ini.loadFileDirectory( fname, INI_LOAD_OVERWRITE, nullptr );
- 	}
+	}
 
 	StringListIt it = m_localFonts.begin();
 	while( it != m_localFonts.end())

Generals/Code/GameEngine/Source/GameClient/MessageStream/SelectionXlat.cpp

@@ -596,6 +596,7 @@ GameMessageDisposition SelectionTranslator::translateGameMessage(const GameMessa
 			DrawableList drawablesThatWillSelect;
 			PickDrawableStruct pds;
 			pds.drawableListToFill = &drawablesThatWillSelect;
+			pds.isPointSelection = isPoint;
 			TheTacticalView->iterateDrawablesInRegion(&selectionRegion, addDrawableToList, &pds);
 
 			if (drawablesThatWillSelect.empty())

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

@@ -23,14 +23,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "PreRTS.h"
-#include "GameClient/SelectionInfo.h"
 
-#include "Common/ActionManager.h"
 #include "GameLogic/Damage.h"
-#include "Common/Player.h"
-#include "Common/PlayerList.h"
+#include "GameLogic/Module/ContainModule.h"
+
+#include "Common/ActionManager.h"
 #include "Common/ThingTemplate.h"
+#include "Common/PlayerList.h"
+#include "Common/Player.h"
 
+#include "GameClient/SelectionInfo.h"
 #include "GameClient/CommandXlat.h"
 #include "GameClient/ControlBar.h"
 #include "GameClient/Drawable.h"
@@ -61,9 +63,8 @@ SelectionInfo::SelectionInfo() :
 { }
 
 //-------------------------------------------------------------------------------------------------
-PickDrawableStruct::PickDrawableStruct() : drawableListToFill(nullptr)
+PickDrawableStruct::PickDrawableStruct() : drawableListToFill(nullptr), isPointSelection(FALSE)
 {
-	drawableListToFill = FALSE;
 	forceAttackMode = TheInGameUI->isInForceAttackMode();
 	UnsignedInt pickType = getPickTypesForContext(forceAttackMode);
 	translatePickTypesToKindof(pickType, kindofsToMatch);
@@ -360,7 +361,36 @@ Bool addDrawableToList( Drawable *draw, void *userData )
 		return FALSE;
 
 	if (!draw->isSelectable())
-		return FALSE;
+  {
+    const Object *obj = draw->getObject();
+    if ( obj && obj->getContainedBy() )//hmm, interesting... he is not selectable but he is contained
+    {// What we are after here is to propagate the selection the selection ti the container
+      // if the container is non-enclosing... see also SelectionXlat, in the left_click case
+
+      ContainModuleInterface *contain = obj->getContainedBy()->getContain();
+      Drawable *containDraw = obj->getContainedBy()->getDrawable();
+      if (contain && ! contain->isEnclosingContainerFor( obj ) && containDraw )
+        return addDrawableToList( containDraw, userData );
+    }
+    else
+      return FALSE;
+  }
+
+#if !RTS_GENERALS && PRESERVE_RETAIL_BEHAVIOR
+	// TheSuperHackers @info
+	// In retail, hidden objects such as passengers are included here when drag-selected, which causes
+	// enemy selection logic to exit early (only 1 enemy unit can be selected at a time). Some players
+	// exploit this bug to determine if a transport contains passengers and consider this an important
+	// feature and an advanced skill to pull off, so we must leave the exploit.
+	if (!pds->isPointSelection)
+	{
+		const Object *obj = draw->getObject();
+		if (obj)
+			if (obj->getControllingPlayer() != ThePlayerList->getLocalPlayer())
+				if (obj->getContain() && draw->getObject()->getContain()->getContainCount() > 0)
+					return FALSE;
+	}
+#endif
 
 	pds->drawableListToFill->push_back(draw);
 	return TRUE;

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

@@ -266,7 +266,6 @@ GameTextManager::GameTextManager()
 		m_buffer2[i] = 0;
 		m_buffer3[i] = 0;
 	}
-	//
 }
 
 //============================================================================
@@ -1459,4 +1458,3 @@ static int __cdecl compareLUT ( const void *i1,  const void*i2)
 
 	return stricmp( lut1->label->str(), lut2->label->str());
 }
-

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

@@ -35,8 +35,8 @@
 #include "GameClient/SelectionInfo.h"
 #include "GameClient/CommandXlat.h"
 #include "GameClient/ControlBar.h"
-#include "GameClient/GameClient.h"
 #include "GameClient/Drawable.h"
+#include "GameClient/GameClient.h"
 #include "GameClient/KeyDefs.h"
 
 
@@ -202,7 +202,7 @@ extern Bool contextCommandForNewSelection(const DrawableList *currentlySelectedD
 
 		if (outSelectionInfo->newCountMine > 0) {
 			if (outSelectionInfo->newCountMine == 1 && selectionIsPoint && !TheInGameUI->isInPreferSelectionMode()) {
- 				return TheGameClient->evaluateContextCommand(newMine, newMine->getPosition(), CommandTranslator::EVALUATE_ONLY) != GameMessage::MSG_INVALID;
+				return TheGameClient->evaluateContextCommand(newMine, newMine->getPosition(), CommandTranslator::EVALUATE_ONLY) != GameMessage::MSG_INVALID;
 			}
 
 			return FALSE;
@@ -346,6 +346,10 @@ Bool addDrawableToList( Drawable *draw, void *userData )
 		return FALSE;
 
 #if !RTS_GENERALS || !PRESERVE_RETAIL_BEHAVIOR
+	// TheSuperHackers @info
+	// In retail, drag-selecting allows the player to select stealthed objects and objects through the
+	// fog. Some players exploit this bug to determine where an opponent's units are and consider this
+	// an important feature and an advanced skill to pull off, so we must leave the exploit.
 	if (draw->getFullyObscuredByShroud())
 		return FALSE;