Skip to content

Proximity capture #65

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
Andreas-W merged 2 commits into from
Jan 10, 2026
Merged

Proximity capture #65

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
96d81c6
initial module implementation
Andreas-W Jan 9, 2026
323054b
finished up module
Andreas-W Jan 10, 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
1 change: 1 addition & 0 deletions Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ static PoolSizeRec PoolSizes[] =
{ "SupplyWarehouseCreate", 48, 16 },
{ "SupplyWarehouseDockUpdate", 48, 16 },
{ "EnemyNearUpdate", 1024, 32 },
{ "ProximityCaptureUpdate", 32, 32 },
{ "TechBuildingBehavior", 32, 32 },
{ "ToppleUpdate", 256, 128 },
{ "TransitionDamageFX", 384, 128 },
Expand Down
238 changes: 120 additions & 118 deletions GeneralsMD/Code/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ set(GAMEENGINE_SRC
Include/Common/List.h
# Include/Common/LocalFile.h
# Include/Common/LocalFileSystem.h
# Include/Common/MapObject.h
# Include/Common/MapObject.h
Include/Common/MapReaderWriterInfo.h
Include/Common/MessageStream.h
Include/Common/MiniLog.h
Expand All @@ -77,7 +77,7 @@ set(GAMEENGINE_SRC
Include/Common/Money.h
Include/Common/MultiplayerSettings.h
Include/Common/NameKeyGenerator.h
# Include/Common/ObjectStatusTypes.h
# Include/Common/ObjectStatusTypes.h
Include/Common/OSDisplay.h
Include/Common/Overridable.h
Include/Common/Override.h
Expand All @@ -90,7 +90,7 @@ set(GAMEENGINE_SRC
Include/Common/ProductionPrerequisite.h
Include/Common/QuickmatchPreferences.h
Include/Common/QuotedPrintable.h
# Include/Common/Radar.h
# Include/Common/Radar.h
# Include/Common/RAMFile.h
# Include/Common/RandomValue.h
Include/Common/Recorder.h
Expand Down Expand Up @@ -200,15 +200,15 @@ set(GAMEENGINE_SRC
Include/GameClient/Line2D.h
Include/GameClient/LoadScreen.h
Include/GameClient/LookAtXlat.h
# Include/GameClient/MapUtil.h
# Include/GameClient/MapUtil.h
Include/GameClient/MessageBox.h
Include/GameClient/MetaEvent.h
Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
Include/GameClient/Module/BeaconClientUpdate.h
Include/GameClient/Module/SwayClientUpdate.h
Include/GameClient/Module/DynamicGeometryClientUpdate.h
Include/GameClient/Mouse.h
# Include/GameClient/ParabolicEase.h
# Include/GameClient/ParabolicEase.h
Include/GameClient/ParticleSys.h
Include/GameClient/PlaceEventTranslator.h
Include/GameClient/ProcessAnimateWindow.h
Expand All @@ -220,15 +220,15 @@ set(GAMEENGINE_SRC
Include/GameClient/Shell.h
Include/GameClient/ShellHooks.h
Include/GameClient/ShellMenuScheme.h
# Include/GameClient/Smudge.h
# Include/GameClient/Snow.h
# Include/GameClient/Smudge.h
# Include/GameClient/Snow.h
Include/GameClient/Statistics.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
# Include/GameClient/TerrainRoads.h
# Include/GameClient/TerrainVisual.h
Include/GameClient/TintStatus.h
# Include/GameClient/VideoPlayer.h
# Include/GameClient/View.h
# Include/GameClient/Water.h
# Include/GameClient/View.h
# Include/GameClient/Water.h
Include/GameClient/WindowLayout.h
# Include/GameClient/WindowVideoManager.h
Include/GameClient/WindowXlat.h
Expand Down Expand Up @@ -322,6 +322,7 @@ set(GAMEENGINE_SRC
Include/GameLogic/Module/EjectPilotDie.h
Include/GameLogic/Module/EMPUpdate.h
Include/GameLogic/Module/EnemyNearUpdate.h
Include/GameLogic/Module/ProximityCaptureUpdate.h
Include/GameLogic/Module/ExperienceScalarUpgrade.h
Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
Include/GameLogic/Module/FireSpreadUpdate.h
Expand Down Expand Up @@ -529,58 +530,58 @@ set(GAMEENGINE_SRC
Include/GameLogic/WeaponSetFlags.h
Include/GameLogic/WeaponSetType.h
Include/GameLogic/WeaponStatus.h
# Include/GameNetwork/Connection.h
# Include/GameNetwork/ConnectionManager.h
# Include/GameNetwork/DisconnectManager.h
# Include/GameNetwork/DownloadManager.h
# Include/GameNetwork/FileTransfer.h
# Include/GameNetwork/FirewallHelper.h
# Include/GameNetwork/FrameData.h
# Include/GameNetwork/FrameDataManager.h
# Include/GameNetwork/FrameMetrics.h
# Include/GameNetwork/GameInfo.h
# Include/GameNetwork/GameMessageParser.h
# Include/GameNetwork/GameSpy/BuddyDefs.h
# Include/GameNetwork/GameSpy/BuddyThread.h
# Include/GameNetwork/GameSpy/GameResultsThread.h
# Include/GameNetwork/GameSpy/GSConfig.h
# Include/GameNetwork/GameSpy/LadderDefs.h
# Include/GameNetwork/GameSpy/LobbyUtils.h
# Include/GameNetwork/GameSpy/MainMenuUtils.h
# Include/GameNetwork/GameSpy/PeerDefs.h
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
# Include/GameNetwork/GameSpy/PeerThread.h
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
# Include/GameNetwork/GameSpy/PersistentStorageThread.h
# Include/GameNetwork/GameSpy/PingThread.h
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
# Include/GameNetwork/GameSpy/ThreadUtils.h
# Include/GameNetwork/GameSpyChat.h
# Include/GameNetwork/GameSpyGameInfo.h
# Include/GameNetwork/GameSpyGP.h
# Include/GameNetwork/GameSpyOverlay.h
# Include/GameNetwork/GameSpyThread.h
# Include/GameNetwork/Connection.h
# Include/GameNetwork/ConnectionManager.h
# Include/GameNetwork/DisconnectManager.h
# Include/GameNetwork/DownloadManager.h
# Include/GameNetwork/FileTransfer.h
# Include/GameNetwork/FirewallHelper.h
# Include/GameNetwork/FrameData.h
# Include/GameNetwork/FrameDataManager.h
# Include/GameNetwork/FrameMetrics.h
# Include/GameNetwork/GameInfo.h
# Include/GameNetwork/GameMessageParser.h
# Include/GameNetwork/GameSpy/BuddyDefs.h
# Include/GameNetwork/GameSpy/BuddyThread.h
# Include/GameNetwork/GameSpy/GameResultsThread.h
# Include/GameNetwork/GameSpy/GSConfig.h
# Include/GameNetwork/GameSpy/LadderDefs.h
# Include/GameNetwork/GameSpy/LobbyUtils.h
# Include/GameNetwork/GameSpy/MainMenuUtils.h
# Include/GameNetwork/GameSpy/PeerDefs.h
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
# Include/GameNetwork/GameSpy/PeerThread.h
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
# Include/GameNetwork/GameSpy/PersistentStorageThread.h
# Include/GameNetwork/GameSpy/PingThread.h
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
# Include/GameNetwork/GameSpy/ThreadUtils.h
# Include/GameNetwork/GameSpyChat.h
# Include/GameNetwork/GameSpyGameInfo.h
# Include/GameNetwork/GameSpyGP.h
# Include/GameNetwork/GameSpyOverlay.h
# Include/GameNetwork/GameSpyThread.h
Include/GameNetwork/GUIUtil.h
# Include/GameNetwork/IPEnumeration.h
# Include/GameNetwork/LANAPI.h
# Include/GameNetwork/LANAPICallbacks.h
# Include/GameNetwork/LANGameInfo.h
# Include/GameNetwork/LANPlayer.h
# Include/GameNetwork/NAT.h
# Include/GameNetwork/NetCommandList.h
# Include/GameNetwork/NetCommandMsg.h
# Include/GameNetwork/NetCommandRef.h
# Include/GameNetwork/NetCommandWrapperList.h
# Include/GameNetwork/NetPacket.h
# Include/GameNetwork/NetworkDefs.h
# Include/GameNetwork/NetworkInterface.h
# Include/GameNetwork/networkutil.h
# Include/GameNetwork/RankPointValue.h
# Include/GameNetwork/Transport.h
# Include/GameNetwork/udp.h
# Include/GameNetwork/User.h
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
# Include/GameNetwork/WOLBrowser/WebBrowser.h
# Include/GameNetwork/IPEnumeration.h
# Include/GameNetwork/LANAPI.h
# Include/GameNetwork/LANAPICallbacks.h
# Include/GameNetwork/LANGameInfo.h
# Include/GameNetwork/LANPlayer.h
# Include/GameNetwork/NAT.h
# Include/GameNetwork/NetCommandList.h
# Include/GameNetwork/NetCommandMsg.h
# Include/GameNetwork/NetCommandRef.h
# Include/GameNetwork/NetCommandWrapperList.h
# Include/GameNetwork/NetPacket.h
# Include/GameNetwork/NetworkDefs.h
# Include/GameNetwork/NetworkInterface.h
# Include/GameNetwork/networkutil.h
# Include/GameNetwork/RankPointValue.h
# Include/GameNetwork/Transport.h
# Include/GameNetwork/udp.h
# Include/GameNetwork/User.h
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
# Include/GameNetwork/WOLBrowser/WebBrowser.h
Include/Precompiled/PreRTS.h
# Source/Common/Audio/AudioEventRTS.cpp
# Source/Common/Audio/AudioRequest.cpp
Expand Down Expand Up @@ -684,9 +685,9 @@ set(GAMEENGINE_SRC
# Source/Common/System/LocalFile.cpp
# Source/Common/System/LocalFileSystem.cpp
#Source/Common/System/MemoryInit.cpp
# Source/Common/System/ObjectStatusTypes.cpp
# Source/Common/System/ObjectStatusTypes.cpp
Source/Common/System/QuotedPrintable.cpp
# Source/Common/System/Radar.cpp
# Source/Common/System/Radar.cpp
# Source/Common/System/RAMFile.cpp
Source/Common/System/registry.cpp
Source/Common/System/SaveGame/GameState.cpp
Expand Down Expand Up @@ -830,7 +831,7 @@ set(GAMEENGINE_SRC
Source/GameClient/Input/Mouse.cpp
Source/GameClient/LanguageFilter.cpp
Source/GameClient/Line2D.cpp
# Source/GameClient/MapUtil.cpp
# Source/GameClient/MapUtil.cpp
Source/GameClient/MessageStream/CommandXlat.cpp
Source/GameClient/MessageStream/GUICommandTranslator.cpp
Source/GameClient/MessageStream/HintSpy.cpp
Expand All @@ -840,10 +841,10 @@ set(GAMEENGINE_SRC
Source/GameClient/MessageStream/PlaceEventTranslator.cpp
Source/GameClient/MessageStream/SelectionXlat.cpp
Source/GameClient/MessageStream/WindowXlat.cpp
# Source/GameClient/ParabolicEase.cpp
# Source/GameClient/ParabolicEase.cpp
Source/GameClient/RadiusDecal.cpp
Source/GameClient/SelectionInfo.cpp
# Source/GameClient/Snow.cpp
# Source/GameClient/Snow.cpp
Source/GameClient/Statistics.cpp
Source/GameClient/System/Anim2D.cpp
Source/GameClient/System/CampaignManager.cpp
Expand All @@ -852,13 +853,13 @@ set(GAMEENGINE_SRC
Source/GameClient/System/Image.cpp
Source/GameClient/System/ParticleSys.cpp
Source/GameClient/System/RayEffect.cpp
# Source/GameClient/System/Smudge.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
# Source/GameClient/System/Smudge.cpp
# Source/GameClient/Terrain/TerrainRoads.cpp
# Source/GameClient/Terrain/TerrainVisual.cpp
# Source/GameClient/VideoPlayer.cpp
# Source/GameClient/VideoStream.cpp
# Source/GameClient/View.cpp
# Source/GameClient/Water.cpp
# Source/GameClient/View.cpp
# Source/GameClient/Water.cpp
Source/GameLogic/AI/AI.cpp
Source/GameLogic/AI/AIDock.cpp
Source/GameLogic/AI/AIGroup.cpp
Expand Down Expand Up @@ -1053,6 +1054,7 @@ set(GAMEENGINE_SRC
Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
Source/GameLogic/Object/Update/EMPUpdate.cpp
Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
Source/GameLogic/Object/Update/ProximityCaptureUpdate.cpp
Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
Expand Down Expand Up @@ -1146,53 +1148,53 @@ set(GAMEENGINE_SRC
Source/GameLogic/System/GameLogic.cpp
Source/GameLogic/System/GameLogicDispatch.cpp
Source/GameLogic/System/RankInfo.cpp
# Source/GameNetwork/Connection.cpp
# Source/GameNetwork/ConnectionManager.cpp
# Source/GameNetwork/DisconnectManager.cpp
# Source/GameNetwork/DownloadManager.cpp
# Source/GameNetwork/FileTransfer.cpp
# Source/GameNetwork/FirewallHelper.cpp
# Source/GameNetwork/FrameData.cpp
# Source/GameNetwork/FrameDataManager.cpp
# Source/GameNetwork/FrameMetrics.cpp
# Source/GameNetwork/GameInfo.cpp
# Source/GameNetwork/GameMessageParser.cpp
# #Source/GameNetwork/GameSpyChat.cpp
# #Source/GameNetwork/GameSpyGameInfo.cpp
# #Source/GameNetwork/GameSpyGP.cpp
# Source/GameNetwork/GameSpy/Chat.cpp
# Source/GameNetwork/GameSpy/GSConfig.cpp
# Source/GameNetwork/GameSpy/LadderDefs.cpp
# Source/GameNetwork/GameSpy/LobbyUtils.cpp
# Source/GameNetwork/GameSpy/MainMenuUtils.cpp
# Source/GameNetwork/GameSpy/PeerDefs.cpp
# Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
# Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
# Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
# Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
# Source/GameNetwork/GameSpyOverlay.cpp
# Source/GameNetwork/Connection.cpp
# Source/GameNetwork/ConnectionManager.cpp
# Source/GameNetwork/DisconnectManager.cpp
# Source/GameNetwork/DownloadManager.cpp
# Source/GameNetwork/FileTransfer.cpp
# Source/GameNetwork/FirewallHelper.cpp
# Source/GameNetwork/FrameData.cpp
# Source/GameNetwork/FrameDataManager.cpp
# Source/GameNetwork/FrameMetrics.cpp
# Source/GameNetwork/GameInfo.cpp
# Source/GameNetwork/GameMessageParser.cpp
# #Source/GameNetwork/GameSpyChat.cpp
# #Source/GameNetwork/GameSpyGameInfo.cpp
# #Source/GameNetwork/GameSpyGP.cpp
# Source/GameNetwork/GameSpy/Chat.cpp
# Source/GameNetwork/GameSpy/GSConfig.cpp
# Source/GameNetwork/GameSpy/LadderDefs.cpp
# Source/GameNetwork/GameSpy/LobbyUtils.cpp
# Source/GameNetwork/GameSpy/MainMenuUtils.cpp
# Source/GameNetwork/GameSpy/PeerDefs.cpp
# Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
# Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
# Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
# Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
# Source/GameNetwork/GameSpyOverlay.cpp
Source/GameNetwork/GUIUtil.cpp
# Source/GameNetwork/IPEnumeration.cpp
# Source/GameNetwork/LANAPI.cpp
# Source/GameNetwork/LANAPICallbacks.cpp
# Source/GameNetwork/LANAPIhandlers.cpp
# Source/GameNetwork/LANGameInfo.cpp
# Source/GameNetwork/NAT.cpp
# Source/GameNetwork/NetCommandList.cpp
# Source/GameNetwork/NetCommandMsg.cpp
# Source/GameNetwork/NetCommandRef.cpp
# Source/GameNetwork/NetCommandWrapperList.cpp
# Source/GameNetwork/NetMessageStream.cpp
# Source/GameNetwork/NetPacket.cpp
# Source/GameNetwork/Network.cpp
# Source/GameNetwork/NetworkUtil.cpp
# Source/GameNetwork/Transport.cpp
# Source/GameNetwork/udp.cpp
# Source/GameNetwork/User.cpp
# Source/GameNetwork/WOLBrowser/WebBrowser.cpp
# Source/GameNetwork/IPEnumeration.cpp
# Source/GameNetwork/LANAPI.cpp
# Source/GameNetwork/LANAPICallbacks.cpp
# Source/GameNetwork/LANAPIhandlers.cpp
# Source/GameNetwork/LANGameInfo.cpp
# Source/GameNetwork/NAT.cpp
# Source/GameNetwork/NetCommandList.cpp
# Source/GameNetwork/NetCommandMsg.cpp
# Source/GameNetwork/NetCommandRef.cpp
# Source/GameNetwork/NetCommandWrapperList.cpp
# Source/GameNetwork/NetMessageStream.cpp
# Source/GameNetwork/NetPacket.cpp
# Source/GameNetwork/Network.cpp
# Source/GameNetwork/NetworkUtil.cpp
# Source/GameNetwork/Transport.cpp
# Source/GameNetwork/udp.cpp
# Source/GameNetwork/User.cpp
# Source/GameNetwork/WOLBrowser/WebBrowser.cpp
Source/Precompiled/PreRTS.cpp
)

Expand Down
Loading