Skip to content

Commit 3dff319

Browse files
Andreas-WAndreas-W
authored
Proximity capture (Andreas-W#65)
* initial module implementation * finished up module
1 parent 46af610 commit 3dff319

File tree

8 files changed

+837
-122
lines changed

8 files changed

+837
-122
lines changed

‎Core/GameEngine/Source/Common/System/GameMemoryInitPools_GeneralsMD.inl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ static PoolSizeRec PoolSizes[] =
269269
{ "SupplyWarehouseCreate", 48, 16 },
270270
{ "SupplyWarehouseDockUpdate", 48, 16 },
271271
{ "EnemyNearUpdate", 1024, 32 },
272+
{ "ProximityCaptureUpdate", 32, 32 },
272273
{ "TechBuildingBehavior", 32, 32 },
273274
{ "ToppleUpdate", 256, 128 },
274275
{ "TransitionDamageFX", 384, 128 },

‎GeneralsMD/Code/GameEngine/CMakeLists.txt‎

Lines changed: 120 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ set(GAMEENGINE_SRC
6565
Include/Common/List.h
6666
# Include/Common/LocalFile.h
6767
# Include/Common/LocalFileSystem.h
68-
# Include/Common/MapObject.h
68+
# Include/Common/MapObject.h
6969
Include/Common/MapReaderWriterInfo.h
7070
Include/Common/MessageStream.h
7171
Include/Common/MiniLog.h
@@ -77,7 +77,7 @@ set(GAMEENGINE_SRC
7777
Include/Common/Money.h
7878
Include/Common/MultiplayerSettings.h
7979
Include/Common/NameKeyGenerator.h
80-
# Include/Common/ObjectStatusTypes.h
80+
# Include/Common/ObjectStatusTypes.h
8181
Include/Common/OSDisplay.h
8282
Include/Common/Overridable.h
8383
Include/Common/Override.h
@@ -90,7 +90,7 @@ set(GAMEENGINE_SRC
9090
Include/Common/ProductionPrerequisite.h
9191
Include/Common/QuickmatchPreferences.h
9292
Include/Common/QuotedPrintable.h
93-
# Include/Common/Radar.h
93+
# Include/Common/Radar.h
9494
# Include/Common/RAMFile.h
9595
# Include/Common/RandomValue.h
9696
Include/Common/Recorder.h
@@ -200,15 +200,15 @@ set(GAMEENGINE_SRC
200200
Include/GameClient/Line2D.h
201201
Include/GameClient/LoadScreen.h
202202
Include/GameClient/LookAtXlat.h
203-
# Include/GameClient/MapUtil.h
203+
# Include/GameClient/MapUtil.h
204204
Include/GameClient/MessageBox.h
205205
Include/GameClient/MetaEvent.h
206206
Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
207207
Include/GameClient/Module/BeaconClientUpdate.h
208208
Include/GameClient/Module/SwayClientUpdate.h
209209
Include/GameClient/Module/DynamicGeometryClientUpdate.h
210210
Include/GameClient/Mouse.h
211-
# Include/GameClient/ParabolicEase.h
211+
# Include/GameClient/ParabolicEase.h
212212
Include/GameClient/ParticleSys.h
213213
Include/GameClient/PlaceEventTranslator.h
214214
Include/GameClient/ProcessAnimateWindow.h
@@ -220,15 +220,15 @@ set(GAMEENGINE_SRC
220220
Include/GameClient/Shell.h
221221
Include/GameClient/ShellHooks.h
222222
Include/GameClient/ShellMenuScheme.h
223-
# Include/GameClient/Smudge.h
224-
# Include/GameClient/Snow.h
223+
# Include/GameClient/Smudge.h
224+
# Include/GameClient/Snow.h
225225
Include/GameClient/Statistics.h
226-
# Include/GameClient/TerrainRoads.h
227-
# Include/GameClient/TerrainVisual.h
226+
# Include/GameClient/TerrainRoads.h
227+
# Include/GameClient/TerrainVisual.h
228228
Include/GameClient/TintStatus.h
229229
# Include/GameClient/VideoPlayer.h
230-
# Include/GameClient/View.h
231-
# Include/GameClient/Water.h
230+
# Include/GameClient/View.h
231+
# Include/GameClient/Water.h
232232
Include/GameClient/WindowLayout.h
233233
# Include/GameClient/WindowVideoManager.h
234234
Include/GameClient/WindowXlat.h
@@ -322,6 +322,7 @@ set(GAMEENGINE_SRC
322322
Include/GameLogic/Module/EjectPilotDie.h
323323
Include/GameLogic/Module/EMPUpdate.h
324324
Include/GameLogic/Module/EnemyNearUpdate.h
325+
Include/GameLogic/Module/ProximityCaptureUpdate.h
325326
Include/GameLogic/Module/ExperienceScalarUpgrade.h
326327
Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h
327328
Include/GameLogic/Module/FireSpreadUpdate.h
@@ -529,58 +530,58 @@ set(GAMEENGINE_SRC
529530
Include/GameLogic/WeaponSetFlags.h
530531
Include/GameLogic/WeaponSetType.h
531532
Include/GameLogic/WeaponStatus.h
532-
# Include/GameNetwork/Connection.h
533-
# Include/GameNetwork/ConnectionManager.h
534-
# Include/GameNetwork/DisconnectManager.h
535-
# Include/GameNetwork/DownloadManager.h
536-
# Include/GameNetwork/FileTransfer.h
537-
# Include/GameNetwork/FirewallHelper.h
538-
# Include/GameNetwork/FrameData.h
539-
# Include/GameNetwork/FrameDataManager.h
540-
# Include/GameNetwork/FrameMetrics.h
541-
# Include/GameNetwork/GameInfo.h
542-
# Include/GameNetwork/GameMessageParser.h
543-
# Include/GameNetwork/GameSpy/BuddyDefs.h
544-
# Include/GameNetwork/GameSpy/BuddyThread.h
545-
# Include/GameNetwork/GameSpy/GameResultsThread.h
546-
# Include/GameNetwork/GameSpy/GSConfig.h
547-
# Include/GameNetwork/GameSpy/LadderDefs.h
548-
# Include/GameNetwork/GameSpy/LobbyUtils.h
549-
# Include/GameNetwork/GameSpy/MainMenuUtils.h
550-
# Include/GameNetwork/GameSpy/PeerDefs.h
551-
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
552-
# Include/GameNetwork/GameSpy/PeerThread.h
553-
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
554-
# Include/GameNetwork/GameSpy/PersistentStorageThread.h
555-
# Include/GameNetwork/GameSpy/PingThread.h
556-
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
557-
# Include/GameNetwork/GameSpy/ThreadUtils.h
558-
# Include/GameNetwork/GameSpyChat.h
559-
# Include/GameNetwork/GameSpyGameInfo.h
560-
# Include/GameNetwork/GameSpyGP.h
561-
# Include/GameNetwork/GameSpyOverlay.h
562-
# Include/GameNetwork/GameSpyThread.h
533+
# Include/GameNetwork/Connection.h
534+
# Include/GameNetwork/ConnectionManager.h
535+
# Include/GameNetwork/DisconnectManager.h
536+
# Include/GameNetwork/DownloadManager.h
537+
# Include/GameNetwork/FileTransfer.h
538+
# Include/GameNetwork/FirewallHelper.h
539+
# Include/GameNetwork/FrameData.h
540+
# Include/GameNetwork/FrameDataManager.h
541+
# Include/GameNetwork/FrameMetrics.h
542+
# Include/GameNetwork/GameInfo.h
543+
# Include/GameNetwork/GameMessageParser.h
544+
# Include/GameNetwork/GameSpy/BuddyDefs.h
545+
# Include/GameNetwork/GameSpy/BuddyThread.h
546+
# Include/GameNetwork/GameSpy/GameResultsThread.h
547+
# Include/GameNetwork/GameSpy/GSConfig.h
548+
# Include/GameNetwork/GameSpy/LadderDefs.h
549+
# Include/GameNetwork/GameSpy/LobbyUtils.h
550+
# Include/GameNetwork/GameSpy/MainMenuUtils.h
551+
# Include/GameNetwork/GameSpy/PeerDefs.h
552+
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
553+
# Include/GameNetwork/GameSpy/PeerThread.h
554+
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
555+
# Include/GameNetwork/GameSpy/PersistentStorageThread.h
556+
# Include/GameNetwork/GameSpy/PingThread.h
557+
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
558+
# Include/GameNetwork/GameSpy/ThreadUtils.h
559+
# Include/GameNetwork/GameSpyChat.h
560+
# Include/GameNetwork/GameSpyGameInfo.h
561+
# Include/GameNetwork/GameSpyGP.h
562+
# Include/GameNetwork/GameSpyOverlay.h
563+
# Include/GameNetwork/GameSpyThread.h
563564
Include/GameNetwork/GUIUtil.h
564-
# Include/GameNetwork/IPEnumeration.h
565-
# Include/GameNetwork/LANAPI.h
566-
# Include/GameNetwork/LANAPICallbacks.h
567-
# Include/GameNetwork/LANGameInfo.h
568-
# Include/GameNetwork/LANPlayer.h
569-
# Include/GameNetwork/NAT.h
570-
# Include/GameNetwork/NetCommandList.h
571-
# Include/GameNetwork/NetCommandMsg.h
572-
# Include/GameNetwork/NetCommandRef.h
573-
# Include/GameNetwork/NetCommandWrapperList.h
574-
# Include/GameNetwork/NetPacket.h
575-
# Include/GameNetwork/NetworkDefs.h
576-
# Include/GameNetwork/NetworkInterface.h
577-
# Include/GameNetwork/networkutil.h
578-
# Include/GameNetwork/RankPointValue.h
579-
# Include/GameNetwork/Transport.h
580-
# Include/GameNetwork/udp.h
581-
# Include/GameNetwork/User.h
582-
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
583-
# Include/GameNetwork/WOLBrowser/WebBrowser.h
565+
# Include/GameNetwork/IPEnumeration.h
566+
# Include/GameNetwork/LANAPI.h
567+
# Include/GameNetwork/LANAPICallbacks.h
568+
# Include/GameNetwork/LANGameInfo.h
569+
# Include/GameNetwork/LANPlayer.h
570+
# Include/GameNetwork/NAT.h
571+
# Include/GameNetwork/NetCommandList.h
572+
# Include/GameNetwork/NetCommandMsg.h
573+
# Include/GameNetwork/NetCommandRef.h
574+
# Include/GameNetwork/NetCommandWrapperList.h
575+
# Include/GameNetwork/NetPacket.h
576+
# Include/GameNetwork/NetworkDefs.h
577+
# Include/GameNetwork/NetworkInterface.h
578+
# Include/GameNetwork/networkutil.h
579+
# Include/GameNetwork/RankPointValue.h
580+
# Include/GameNetwork/Transport.h
581+
# Include/GameNetwork/udp.h
582+
# Include/GameNetwork/User.h
583+
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
584+
# Include/GameNetwork/WOLBrowser/WebBrowser.h
584585
Include/Precompiled/PreRTS.h
585586
# Source/Common/Audio/AudioEventRTS.cpp
586587
# Source/Common/Audio/AudioRequest.cpp
@@ -684,9 +685,9 @@ set(GAMEENGINE_SRC
684685
# Source/Common/System/LocalFile.cpp
685686
# Source/Common/System/LocalFileSystem.cpp
686687
#Source/Common/System/MemoryInit.cpp
687-
# Source/Common/System/ObjectStatusTypes.cpp
688+
# Source/Common/System/ObjectStatusTypes.cpp
688689
Source/Common/System/QuotedPrintable.cpp
689-
# Source/Common/System/Radar.cpp
690+
# Source/Common/System/Radar.cpp
690691
# Source/Common/System/RAMFile.cpp
691692
Source/Common/System/registry.cpp
692693
Source/Common/System/SaveGame/GameState.cpp
@@ -830,7 +831,7 @@ set(GAMEENGINE_SRC
830831
Source/GameClient/Input/Mouse.cpp
831832
Source/GameClient/LanguageFilter.cpp
832833
Source/GameClient/Line2D.cpp
833-
# Source/GameClient/MapUtil.cpp
834+
# Source/GameClient/MapUtil.cpp
834835
Source/GameClient/MessageStream/CommandXlat.cpp
835836
Source/GameClient/MessageStream/GUICommandTranslator.cpp
836837
Source/GameClient/MessageStream/HintSpy.cpp
@@ -840,10 +841,10 @@ set(GAMEENGINE_SRC
840841
Source/GameClient/MessageStream/PlaceEventTranslator.cpp
841842
Source/GameClient/MessageStream/SelectionXlat.cpp
842843
Source/GameClient/MessageStream/WindowXlat.cpp
843-
# Source/GameClient/ParabolicEase.cpp
844+
# Source/GameClient/ParabolicEase.cpp
844845
Source/GameClient/RadiusDecal.cpp
845846
Source/GameClient/SelectionInfo.cpp
846-
# Source/GameClient/Snow.cpp
847+
# Source/GameClient/Snow.cpp
847848
Source/GameClient/Statistics.cpp
848849
Source/GameClient/System/Anim2D.cpp
849850
Source/GameClient/System/CampaignManager.cpp
@@ -852,13 +853,13 @@ set(GAMEENGINE_SRC
852853
Source/GameClient/System/Image.cpp
853854
Source/GameClient/System/ParticleSys.cpp
854855
Source/GameClient/System/RayEffect.cpp
855-
# Source/GameClient/System/Smudge.cpp
856-
# Source/GameClient/Terrain/TerrainRoads.cpp
857-
# Source/GameClient/Terrain/TerrainVisual.cpp
856+
# Source/GameClient/System/Smudge.cpp
857+
# Source/GameClient/Terrain/TerrainRoads.cpp
858+
# Source/GameClient/Terrain/TerrainVisual.cpp
858859
# Source/GameClient/VideoPlayer.cpp
859860
# Source/GameClient/VideoStream.cpp
860-
# Source/GameClient/View.cpp
861-
# Source/GameClient/Water.cpp
861+
# Source/GameClient/View.cpp
862+
# Source/GameClient/Water.cpp
862863
Source/GameLogic/AI/AI.cpp
863864
Source/GameLogic/AI/AIDock.cpp
864865
Source/GameLogic/AI/AIGroup.cpp
@@ -1053,6 +1054,7 @@ set(GAMEENGINE_SRC
10531054
Source/GameLogic/Object/Update/DynamicShroudClearingRangeUpdate.cpp
10541055
Source/GameLogic/Object/Update/EMPUpdate.cpp
10551056
Source/GameLogic/Object/Update/EnemyNearUpdate.cpp
1057+
Source/GameLogic/Object/Update/ProximityCaptureUpdate.cpp
10561058
Source/GameLogic/Object/Update/FireOCLAfterWeaponCooldownUpdate.cpp
10571059
Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
10581060
Source/GameLogic/Object/Update/FirestormDynamicGeometryInfoUpdate.cpp
@@ -1146,53 +1148,53 @@ set(GAMEENGINE_SRC
11461148
Source/GameLogic/System/GameLogic.cpp
11471149
Source/GameLogic/System/GameLogicDispatch.cpp
11481150
Source/GameLogic/System/RankInfo.cpp
1149-
# Source/GameNetwork/Connection.cpp
1150-
# Source/GameNetwork/ConnectionManager.cpp
1151-
# Source/GameNetwork/DisconnectManager.cpp
1152-
# Source/GameNetwork/DownloadManager.cpp
1153-
# Source/GameNetwork/FileTransfer.cpp
1154-
# Source/GameNetwork/FirewallHelper.cpp
1155-
# Source/GameNetwork/FrameData.cpp
1156-
# Source/GameNetwork/FrameDataManager.cpp
1157-
# Source/GameNetwork/FrameMetrics.cpp
1158-
# Source/GameNetwork/GameInfo.cpp
1159-
# Source/GameNetwork/GameMessageParser.cpp
1160-
# #Source/GameNetwork/GameSpyChat.cpp
1161-
# #Source/GameNetwork/GameSpyGameInfo.cpp
1162-
# #Source/GameNetwork/GameSpyGP.cpp
1163-
# Source/GameNetwork/GameSpy/Chat.cpp
1164-
# Source/GameNetwork/GameSpy/GSConfig.cpp
1165-
# Source/GameNetwork/GameSpy/LadderDefs.cpp
1166-
# Source/GameNetwork/GameSpy/LobbyUtils.cpp
1167-
# Source/GameNetwork/GameSpy/MainMenuUtils.cpp
1168-
# Source/GameNetwork/GameSpy/PeerDefs.cpp
1169-
# Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
1170-
# Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
1171-
# Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
1172-
# Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
1173-
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
1174-
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
1175-
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
1176-
# Source/GameNetwork/GameSpyOverlay.cpp
1151+
# Source/GameNetwork/Connection.cpp
1152+
# Source/GameNetwork/ConnectionManager.cpp
1153+
# Source/GameNetwork/DisconnectManager.cpp
1154+
# Source/GameNetwork/DownloadManager.cpp
1155+
# Source/GameNetwork/FileTransfer.cpp
1156+
# Source/GameNetwork/FirewallHelper.cpp
1157+
# Source/GameNetwork/FrameData.cpp
1158+
# Source/GameNetwork/FrameDataManager.cpp
1159+
# Source/GameNetwork/FrameMetrics.cpp
1160+
# Source/GameNetwork/GameInfo.cpp
1161+
# Source/GameNetwork/GameMessageParser.cpp
1162+
# #Source/GameNetwork/GameSpyChat.cpp
1163+
# #Source/GameNetwork/GameSpyGameInfo.cpp
1164+
# #Source/GameNetwork/GameSpyGP.cpp
1165+
# Source/GameNetwork/GameSpy/Chat.cpp
1166+
# Source/GameNetwork/GameSpy/GSConfig.cpp
1167+
# Source/GameNetwork/GameSpy/LadderDefs.cpp
1168+
# Source/GameNetwork/GameSpy/LobbyUtils.cpp
1169+
# Source/GameNetwork/GameSpy/MainMenuUtils.cpp
1170+
# Source/GameNetwork/GameSpy/PeerDefs.cpp
1171+
# Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
1172+
# Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
1173+
# Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
1174+
# Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
1175+
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
1176+
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
1177+
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
1178+
# Source/GameNetwork/GameSpyOverlay.cpp
11771179
Source/GameNetwork/GUIUtil.cpp
1178-
# Source/GameNetwork/IPEnumeration.cpp
1179-
# Source/GameNetwork/LANAPI.cpp
1180-
# Source/GameNetwork/LANAPICallbacks.cpp
1181-
# Source/GameNetwork/LANAPIhandlers.cpp
1182-
# Source/GameNetwork/LANGameInfo.cpp
1183-
# Source/GameNetwork/NAT.cpp
1184-
# Source/GameNetwork/NetCommandList.cpp
1185-
# Source/GameNetwork/NetCommandMsg.cpp
1186-
# Source/GameNetwork/NetCommandRef.cpp
1187-
# Source/GameNetwork/NetCommandWrapperList.cpp
1188-
# Source/GameNetwork/NetMessageStream.cpp
1189-
# Source/GameNetwork/NetPacket.cpp
1190-
# Source/GameNetwork/Network.cpp
1191-
# Source/GameNetwork/NetworkUtil.cpp
1192-
# Source/GameNetwork/Transport.cpp
1193-
# Source/GameNetwork/udp.cpp
1194-
# Source/GameNetwork/User.cpp
1195-
# Source/GameNetwork/WOLBrowser/WebBrowser.cpp
1180+
# Source/GameNetwork/IPEnumeration.cpp
1181+
# Source/GameNetwork/LANAPI.cpp
1182+
# Source/GameNetwork/LANAPICallbacks.cpp
1183+
# Source/GameNetwork/LANAPIhandlers.cpp
1184+
# Source/GameNetwork/LANGameInfo.cpp
1185+
# Source/GameNetwork/NAT.cpp
1186+
# Source/GameNetwork/NetCommandList.cpp
1187+
# Source/GameNetwork/NetCommandMsg.cpp
1188+
# Source/GameNetwork/NetCommandRef.cpp
1189+
# Source/GameNetwork/NetCommandWrapperList.cpp
1190+
# Source/GameNetwork/NetMessageStream.cpp
1191+
# Source/GameNetwork/NetPacket.cpp
1192+
# Source/GameNetwork/Network.cpp
1193+
# Source/GameNetwork/NetworkUtil.cpp
1194+
# Source/GameNetwork/Transport.cpp
1195+
# Source/GameNetwork/udp.cpp
1196+
# Source/GameNetwork/User.cpp
1197+
# Source/GameNetwork/WOLBrowser/WebBrowser.cpp
11961198
Source/Precompiled/PreRTS.cpp
11971199
)
11981200

0 commit comments

Comments
 (0)