Skip to content

unify(client): Merge DisplayString, GameText, GlobalLanguage, SelectionInfo code and move several GameClient files to Core #2337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Feb 21, 2026
Merged

unify(client): Merge DisplayString, GameText, GlobalLanguage, SelectionInfo code and move several GameClient files to Core #2337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea2154a
unify(client): Merge DisplayString, GameText, GlobalLanguage, Selecti…
xezon Feb 21, 2026
72f699c
unify(client): Move several GameClient files to Core (#2337)
xezon Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,28 +144,28 @@ set(GAMEENGINE_SRC
# Include/GameClient/AnimateWindowManager.h
# Include/GameClient/CampaignManager.h
Include/GameClient/ChallengeGenerals.h
# Include/GameClient/ClientInstance.h
Include/GameClient/ClientInstance.h
Include/GameClient/ClientRandomValue.h
# Include/GameClient/Color.h
Include/GameClient/Color.h
# Include/GameClient/CommandXlat.h
# Include/GameClient/ControlBar.h
# Include/GameClient/ControlBarResizer.h
# Include/GameClient/ControlBarScheme.h
# Include/GameClient/Credits.h
Include/GameClient/Credits.h
# Include/GameClient/DebugDisplay.h
# Include/GameClient/Diplomacy.h
# Include/GameClient/DisconnectMenu.h
# Include/GameClient/Display.h
# Include/GameClient/DisplayString.h
# Include/GameClient/DisplayStringManager.h
Include/GameClient/DisplayString.h
Include/GameClient/DisplayStringManager.h
# Include/GameClient/Drawable.h
# Include/GameClient/DrawableInfo.h
# Include/GameClient/DrawGroupInfo.h
Include/GameClient/DrawGroupInfo.h
# Include/GameClient/EstablishConnectionsMenu.h
# Include/GameClient/Eva.h
# Include/GameClient/ExtendedMessageBox.h
# Include/GameClient/FontDesc.h
# Include/GameClient/FXList.h
Include/GameClient/FXList.h
# Include/GameClient/Gadget.h
# Include/GameClient/GadgetCheckBox.h
# Include/GameClient/GadgetComboBox.h
Expand All @@ -180,14 +180,14 @@ set(GAMEENGINE_SRC
# Include/GameClient/GameClient.h
Include/GameClient/GameFont.h
# Include/GameClient/GameInfoWindow.h
# Include/GameClient/GameText.h
Include/GameClient/GameText.h
Include/GameClient/GameWindow.h
Include/GameClient/GameWindowGlobal.h
# Include/GameClient/GameWindowID.h
# Include/GameClient/GameWindowManager.h
Include/GameClient/GameWindowTransitions.h
# Include/GameClient/GlobalLanguage.h
# Include/GameClient/GraphDraw.h
Include/GameClient/GlobalLanguage.h
Include/GameClient/GraphDraw.h
# Include/GameClient/GUICallbacks.h
# Include/GameClient/GUICommandTranslator.h
Include/GameClient/HeaderTemplate.h
Expand All @@ -198,8 +198,8 @@ set(GAMEENGINE_SRC
# Include/GameClient/InGameUI.h
Include/GameClient/Keyboard.h
# Include/GameClient/KeyDefs.h
# Include/GameClient/LanguageFilter.h
# Include/GameClient/Line2D.h
Include/GameClient/LanguageFilter.h
Include/GameClient/Line2D.h
Include/GameClient/LoadScreen.h
# Include/GameClient/LookAtXlat.h
Include/GameClient/MapUtil.h
Expand All @@ -213,17 +213,17 @@ set(GAMEENGINE_SRC
Include/GameClient/ParticleSys.h
# Include/GameClient/PlaceEventTranslator.h
Include/GameClient/ProcessAnimateWindow.h
# Include/GameClient/RadiusDecal.h
Include/GameClient/RadiusDecal.h
# Include/GameClient/RayEffect.h
# Include/GameClient/SelectionInfo.h
Include/GameClient/SelectionInfo.h
# Include/GameClient/SelectionXlat.h
# Include/GameClient/Shadow.h
# Include/GameClient/Shell.h
# Include/GameClient/ShellHooks.h
# Include/GameClient/ShellMenuScheme.h
Include/GameClient/Smudge.h
Include/GameClient/Snow.h
# Include/GameClient/Statistics.h
Include/GameClient/Statistics.h
Include/GameClient/TerrainRoads.h
Include/GameClient/TerrainVisual.h
Include/GameClient/VideoPlayer.h
Expand Down Expand Up @@ -688,24 +688,24 @@ set(GAMEENGINE_SRC
Source/Common/UserPreferences.cpp
# Source/Common/version.cpp
Source/Common/WorkerProcess.cpp
# Source/GameClient/ClientInstance.cpp
# Source/GameClient/Color.cpp
# Source/GameClient/Credits.cpp
Source/GameClient/ClientInstance.cpp
Source/GameClient/Color.cpp
Source/GameClient/Credits.cpp
# Source/GameClient/Display.cpp
# Source/GameClient/DisplayString.cpp
# Source/GameClient/DisplayStringManager.cpp
Source/GameClient/DisplayString.cpp
Source/GameClient/DisplayStringManager.cpp
# Source/GameClient/Drawable.cpp
# Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
# Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
# Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
# Source/GameClient/DrawGroupInfo.cpp
Source/GameClient/DrawGroupInfo.cpp
# Source/GameClient/Eva.cpp
# Source/GameClient/FXList.cpp
Source/GameClient/FXList.cpp
# Source/GameClient/GameClient.cpp
# Source/GameClient/GameClientDispatch.cpp
# Source/GameClient/GameText.cpp
# Source/GameClient/GlobalLanguage.cpp
# Source/GameClient/GraphDraw.cpp
Source/GameClient/GameText.cpp
Source/GameClient/GlobalLanguage.cpp
Source/GameClient/GraphDraw.cpp
# Source/GameClient/GUI/AnimateWindowManager.cpp
Source/GameClient/GUI/ChallengeGenerals.cpp
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
Expand Down Expand Up @@ -803,8 +803,8 @@ set(GAMEENGINE_SRC
# Source/GameClient/InGameUI.cpp
Source/GameClient/Input/Keyboard.cpp
Source/GameClient/Input/Mouse.cpp
# Source/GameClient/LanguageFilter.cpp
# Source/GameClient/Line2D.cpp
Source/GameClient/LanguageFilter.cpp
Source/GameClient/Line2D.cpp
Source/GameClient/MapUtil.cpp
# Source/GameClient/MessageStream/CommandXlat.cpp
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
Expand All @@ -816,10 +816,10 @@ set(GAMEENGINE_SRC
# Source/GameClient/MessageStream/SelectionXlat.cpp
# Source/GameClient/MessageStream/WindowXlat.cpp
Source/GameClient/ParabolicEase.cpp
# Source/GameClient/RadiusDecal.cpp
# Source/GameClient/SelectionInfo.cpp
Source/GameClient/RadiusDecal.cpp
Source/GameClient/SelectionInfo.cpp
Source/GameClient/Snow.cpp
# Source/GameClient/Statistics.cpp
Source/GameClient/Statistics.cpp
# Source/GameClient/System/Anim2D.cpp
# Source/GameClient/System/CampaignManager.cpp
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
Expand Down
0 ...ngine/Include/GameClient/ClientInstance.h → ...ngine/Include/GameClient/ClientInstance.h
View file
Open in desktop
File renamed without changes.
0 ...ode/GameEngine/Include/GameClient/Color.h → Core/GameEngine/Include/GameClient/Color.h
View file
Open in desktop
File renamed without changes.
0 ...e/GameEngine/Include/GameClient/Credits.h → Core/GameEngine/Include/GameClient/Credits.h
View file
Open in desktop
File renamed without changes.
0 ...Engine/Include/GameClient/DisplayString.h → ...Engine/Include/GameClient/DisplayString.h
View file
Open in desktop
File renamed without changes.
0 ...Include/GameClient/DisplayStringManager.h → ...Include/GameClient/DisplayStringManager.h
View file
Open in desktop
File renamed without changes.
0 ...Engine/Include/GameClient/DrawGroupInfo.h → ...Engine/Include/GameClient/DrawGroupInfo.h
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Include/GameClient/FXList.h → Core/GameEngine/Include/GameClient/FXList.h
View file
Open in desktop
File renamed without changes.
0 .../GameEngine/Include/GameClient/GameText.h → .../GameEngine/Include/GameClient/GameText.h
View file
Open in desktop
File renamed without changes.
0 ...ngine/Include/GameClient/GlobalLanguage.h → ...ngine/Include/GameClient/GlobalLanguage.h
View file
Open in desktop
File renamed without changes.
0 ...GameEngine/Include/GameClient/GraphDraw.h → ...GameEngine/Include/GameClient/GraphDraw.h
View file
Open in desktop
File renamed without changes.
0 ...ngine/Include/GameClient/LanguageFilter.h → ...ngine/Include/GameClient/LanguageFilter.h
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Include/GameClient/Line2D.h → Core/GameEngine/Include/GameClient/Line2D.h
View file
Open in desktop
File renamed without changes.
0 ...meEngine/Include/GameClient/RadiusDecal.h → ...meEngine/Include/GameClient/RadiusDecal.h
View file
Open in desktop
File renamed without changes.
0 ...Engine/Include/GameClient/SelectionInfo.h → ...Engine/Include/GameClient/SelectionInfo.h
View file
Open in desktop
File renamed without changes.
0 ...ameEngine/Include/GameClient/Statistics.h → ...ameEngine/Include/GameClient/Statistics.h
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/GameClient/ClientInstance.cpp → ...gine/Source/GameClient/ClientInstance.cpp
View file
Open in desktop
File renamed without changes.
0 ...de/GameEngine/Source/GameClient/Color.cpp → Core/GameEngine/Source/GameClient/Color.cpp
View file
Open in desktop
File renamed without changes.
0 .../GameEngine/Source/GameClient/Credits.cpp → .../GameEngine/Source/GameClient/Credits.cpp
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/GameClient/DisplayString.cpp → ...ngine/Source/GameClient/DisplayString.cpp
View file
Open in desktop
File renamed without changes.
0 ...ource/GameClient/DisplayStringManager.cpp → ...ource/GameClient/DisplayStringManager.cpp
View file
Open in desktop
File renamed without changes.
0 ...ngine/Source/GameClient/DrawGroupInfo.cpp → ...ngine/Source/GameClient/DrawGroupInfo.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/GameEngine/Source/GameClient/FXList.cpp → Core/GameEngine/Source/GameClient/FXList.cpp
View file
Open in desktop
File renamed without changes.
2 changes: 0 additions & 2 deletions ...GameEngine/Source/GameClient/GameText.cpp → ...GameEngine/Source/GameClient/GameText.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ GameTextManager::GameTextManager()
m_buffer2[i] = 0;
m_buffer3[i] = 0;
}
//
}

//============================================================================
Expand Down Expand Up @@ -1459,4 +1458,3 @@ static int __cdecl compareLUT ( const void *i1, const void*i2)

return stricmp( lut1->label->str(), lut2->label->str());
}

0 ...gine/Source/GameClient/GlobalLanguage.cpp → ...gine/Source/GameClient/GlobalLanguage.cpp
View file
Open in desktop
File renamed without changes.
0 ...ameEngine/Source/GameClient/GraphDraw.cpp → ...ameEngine/Source/GameClient/GraphDraw.cpp
View file
Open in desktop
File renamed without changes.
0 ...gine/Source/GameClient/LanguageFilter.cpp → ...gine/Source/GameClient/LanguageFilter.cpp
View file
Open in desktop
File renamed without changes.
0 ...e/GameEngine/Source/GameClient/Line2D.cpp → Core/GameEngine/Source/GameClient/Line2D.cpp
View file
Open in desktop
File renamed without changes.
0 ...eEngine/Source/GameClient/RadiusDecal.cpp → ...eEngine/Source/GameClient/RadiusDecal.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 6 additions & 2 deletions ...ngine/Source/GameClient/SelectionInfo.cpp → ...ngine/Source/GameClient/SelectionInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
0 ...meEngine/Source/GameClient/Statistics.cpp → ...meEngine/Source/GameClient/Statistics.cpp
View file
Open in desktop
File renamed without changes.
60 changes: 30 additions & 30 deletions Generals/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,28 +133,28 @@ set(GAMEENGINE_SRC
Include/GameClient/AnimateWindowManager.h
# Include/GameClient/ChallengeGenerals.h
Include/GameClient/CampaignManager.h
Include/GameClient/ClientInstance.h
# Include/GameClient/ClientInstance.h
# Include/GameClient/ClientRandomValue.h
Include/GameClient/Color.h
# Include/GameClient/Color.h
Include/GameClient/CommandXlat.h
Include/GameClient/ControlBar.h
Include/GameClient/ControlBarResizer.h
Include/GameClient/ControlBarScheme.h
Include/GameClient/Credits.h
# Include/GameClient/Credits.h
Include/GameClient/DebugDisplay.h
Include/GameClient/Diplomacy.h
Include/GameClient/DisconnectMenu.h
Include/GameClient/Display.h
Include/GameClient/DisplayString.h
Include/GameClient/DisplayStringManager.h
# Include/GameClient/DisplayString.h
# Include/GameClient/DisplayStringManager.h
Include/GameClient/Drawable.h
Include/GameClient/DrawableInfo.h
Include/GameClient/DrawGroupInfo.h
# Include/GameClient/DrawGroupInfo.h
Include/GameClient/EstablishConnectionsMenu.h
Include/GameClient/Eva.h
Include/GameClient/ExtendedMessageBox.h
Include/GameClient/FontDesc.h
Include/GameClient/FXList.h
# Include/GameClient/FXList.h
Include/GameClient/Gadget.h
Include/GameClient/GadgetCheckBox.h
Include/GameClient/GadgetComboBox.h
Expand All @@ -169,14 +169,14 @@ set(GAMEENGINE_SRC
Include/GameClient/GameClient.h
# Include/GameClient/GameFont.h
Include/GameClient/GameInfoWindow.h
Include/GameClient/GameText.h
# Include/GameClient/GameText.h
# Include/GameClient/GameWindow.h
# Include/GameClient/GameWindowGlobal.h
Include/GameClient/GameWindowID.h
Include/GameClient/GameWindowManager.h
# Include/GameClient/GameWindowTransitions.h
Include/GameClient/GlobalLanguage.h
Include/GameClient/GraphDraw.h
# Include/GameClient/GlobalLanguage.h
# Include/GameClient/GraphDraw.h
Include/GameClient/GUICallbacks.h
Include/GameClient/GUICommandTranslator.h
# Include/GameClient/HeaderTemplate.h
Expand All @@ -187,8 +187,8 @@ set(GAMEENGINE_SRC
Include/GameClient/InGameUI.h
# Include/GameClient/Keyboard.h
Include/GameClient/KeyDefs.h
Include/GameClient/LanguageFilter.h
Include/GameClient/Line2D.h
# Include/GameClient/LanguageFilter.h
# Include/GameClient/Line2D.h
# Include/GameClient/LoadScreen.h
Include/GameClient/LookAtXlat.h
# Include/GameClient/MapUtil.h
Expand All @@ -201,15 +201,15 @@ set(GAMEENGINE_SRC
# Include/GameClient/ParticleSys.h
Include/GameClient/PlaceEventTranslator.h
# Include/GameClient/ProcessAnimateWindow.h
Include/GameClient/RadiusDecal.h
# Include/GameClient/RadiusDecal.h
Include/GameClient/RayEffect.h
Include/GameClient/SelectionInfo.h
# Include/GameClient/SelectionInfo.h
Include/GameClient/SelectionXlat.h
Include/GameClient/Shadow.h
Include/GameClient/Shell.h
Include/GameClient/ShellHooks.h
Include/GameClient/ShellMenuScheme.h
Include/GameClient/Statistics.h
# Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
# Include/GameClient/VideoPlayer.h
Expand Down Expand Up @@ -636,24 +636,24 @@ set(GAMEENGINE_SRC
# Source/Common/UserPreferences.cpp
Source/Common/version.cpp
# Source/Common/WorkerProcess.cpp
Source/GameClient/ClientInstance.cpp
Source/GameClient/Color.cpp
Source/GameClient/Credits.cpp
# Source/GameClient/ClientInstance.cpp
# Source/GameClient/Color.cpp
# Source/GameClient/Credits.cpp
Source/GameClient/Display.cpp
Source/GameClient/DisplayString.cpp
Source/GameClient/DisplayStringManager.cpp
# Source/GameClient/DisplayString.cpp
# Source/GameClient/DisplayStringManager.cpp
Source/GameClient/Drawable.cpp
Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
Source/GameClient/DrawGroupInfo.cpp
# Source/GameClient/DrawGroupInfo.cpp
Source/GameClient/Eva.cpp
Source/GameClient/FXList.cpp
# Source/GameClient/FXList.cpp
Source/GameClient/GameClient.cpp
Source/GameClient/GameClientDispatch.cpp
Source/GameClient/GameText.cpp
Source/GameClient/GlobalLanguage.cpp
Source/GameClient/GraphDraw.cpp
# Source/GameClient/GameText.cpp
# Source/GameClient/GlobalLanguage.cpp
# Source/GameClient/GraphDraw.cpp
Source/GameClient/GUI/AnimateWindowManager.cpp
# Source/GameClient/GUI/ChallengeGenerals.cpp
Source/GameClient/GUI/ControlBar/ControlBar.cpp
Expand Down Expand Up @@ -750,8 +750,8 @@ set(GAMEENGINE_SRC
Source/GameClient/InGameUI.cpp
# Source/GameClient/Input/Keyboard.cpp
# Source/GameClient/Input/Mouse.cpp
Source/GameClient/LanguageFilter.cpp
Source/GameClient/Line2D.cpp
# Source/GameClient/LanguageFilter.cpp
# Source/GameClient/Line2D.cpp
# Source/GameClient/MapUtil.cpp
Source/GameClient/MessageStream/CommandXlat.cpp
Source/GameClient/MessageStream/GUICommandTranslator.cpp
Expand All @@ -762,9 +762,9 @@ set(GAMEENGINE_SRC
Source/GameClient/MessageStream/PlaceEventTranslator.cpp
Source/GameClient/MessageStream/SelectionXlat.cpp
Source/GameClient/MessageStream/WindowXlat.cpp
Source/GameClient/RadiusDecal.cpp
Source/GameClient/SelectionInfo.cpp
Source/GameClient/Statistics.cpp
# Source/GameClient/RadiusDecal.cpp
# Source/GameClient/SelectionInfo.cpp
# Source/GameClient/Statistics.cpp
Source/GameClient/System/Anim2D.cpp
Source/GameClient/System/CampaignManager.cpp
# "Source/GameClient/System/Debug Displayers/AudioDebugDisplay.cpp"
Expand Down
Loading
Loading