Skip to content

Commit 541e44e

Browse files
bobtistabobtista
committed
refactor(network): unify identical network code in Core
1 parent 8a9db21 commit 541e44e

File tree

141 files changed

+66
-21160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+66
-21160
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -501,58 +501,58 @@ set(GAMEENGINE_SRC
501501
# Include/GameLogic/WeaponSetFlags.h
502502
# Include/GameLogic/WeaponSetType.h
503503
# Include/GameLogic/WeaponStatus.h
504-
# Include/GameNetwork/Connection.h
505-
# Include/GameNetwork/ConnectionManager.h
504+
Include/GameNetwork/Connection.h
505+
Include/GameNetwork/ConnectionManager.h
506506
# Include/GameNetwork/DisconnectManager.h
507-
# Include/GameNetwork/DownloadManager.h
508-
# Include/GameNetwork/FileTransfer.h
509-
# Include/GameNetwork/FirewallHelper.h
510-
# Include/GameNetwork/FrameData.h
511-
# Include/GameNetwork/FrameDataManager.h
512-
# Include/GameNetwork/FrameMetrics.h
507+
Include/GameNetwork/DownloadManager.h
508+
Include/GameNetwork/FileTransfer.h
509+
Include/GameNetwork/FirewallHelper.h
510+
Include/GameNetwork/FrameData.h
511+
Include/GameNetwork/FrameDataManager.h
512+
Include/GameNetwork/FrameMetrics.h
513513
# Include/GameNetwork/GameInfo.h
514-
# Include/GameNetwork/GameMessageParser.h
515-
# Include/GameNetwork/GameSpy/BuddyDefs.h
516-
# Include/GameNetwork/GameSpy/BuddyThread.h
517-
# Include/GameNetwork/GameSpy/GameResultsThread.h
514+
Include/GameNetwork/GameMessageParser.h
515+
Include/GameNetwork/GameSpy/BuddyDefs.h
516+
Include/GameNetwork/GameSpy/BuddyThread.h
517+
Include/GameNetwork/GameSpy/GameResultsThread.h
518518
# Include/GameNetwork/GameSpy/GSConfig.h
519-
# Include/GameNetwork/GameSpy/LadderDefs.h
519+
Include/GameNetwork/GameSpy/LadderDefs.h
520520
# Include/GameNetwork/GameSpy/LobbyUtils.h
521521
# Include/GameNetwork/GameSpy/MainMenuUtils.h
522-
# Include/GameNetwork/GameSpy/PeerDefs.h
522+
Include/GameNetwork/GameSpy/PeerDefs.h
523523
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
524524
# Include/GameNetwork/GameSpy/PeerThread.h
525-
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
525+
Include/GameNetwork/GameSpy/PersistentStorageDefs.h
526526
# Include/GameNetwork/GameSpy/PersistentStorageThread.h
527-
# Include/GameNetwork/GameSpy/PingThread.h
528-
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
529-
# Include/GameNetwork/GameSpy/ThreadUtils.h
530-
# Include/GameNetwork/GameSpyChat.h
531-
# Include/GameNetwork/GameSpyGameInfo.h
532-
# Include/GameNetwork/GameSpyGP.h
533-
# Include/GameNetwork/GameSpyOverlay.h
534-
# Include/GameNetwork/GameSpyThread.h
527+
Include/GameNetwork/GameSpy/PingThread.h
528+
Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
529+
Include/GameNetwork/GameSpy/ThreadUtils.h
530+
Include/GameNetwork/GameSpyChat.h
531+
Include/GameNetwork/GameSpyGameInfo.h
532+
Include/GameNetwork/GameSpyGP.h
533+
Include/GameNetwork/GameSpyOverlay.h
534+
Include/GameNetwork/GameSpyThread.h
535535
# Include/GameNetwork/GUIUtil.h
536-
# Include/GameNetwork/IPEnumeration.h
537-
# Include/GameNetwork/LANAPI.h
538-
# Include/GameNetwork/LANAPICallbacks.h
539-
# Include/GameNetwork/LANGameInfo.h
540-
# Include/GameNetwork/LANPlayer.h
541-
# Include/GameNetwork/NAT.h
542-
# Include/GameNetwork/NetCommandList.h
543-
# Include/GameNetwork/NetCommandMsg.h
544-
# Include/GameNetwork/NetCommandRef.h
545-
# Include/GameNetwork/NetCommandWrapperList.h
546-
# Include/GameNetwork/NetPacket.h
547-
# Include/GameNetwork/NetworkDefs.h
548-
# Include/GameNetwork/NetworkInterface.h
549-
# Include/GameNetwork/networkutil.h
550-
# Include/GameNetwork/RankPointValue.h
551-
# Include/GameNetwork/Transport.h
552-
# Include/GameNetwork/udp.h
553-
# Include/GameNetwork/User.h
554-
# Include/GameNetwork/WOLBrowser/FEBDispatch.h
555-
# Include/GameNetwork/WOLBrowser/WebBrowser.h
536+
Include/GameNetwork/IPEnumeration.h
537+
Include/GameNetwork/LANAPI.h
538+
Include/GameNetwork/LANAPICallbacks.h
539+
Include/GameNetwork/LANGameInfo.h
540+
Include/GameNetwork/LANPlayer.h
541+
Include/GameNetwork/NAT.h
542+
Include/GameNetwork/NetCommandList.h
543+
Include/GameNetwork/NetCommandMsg.h
544+
Include/GameNetwork/NetCommandRef.h
545+
Include/GameNetwork/NetCommandWrapperList.h
546+
Include/GameNetwork/NetPacket.h
547+
Include/GameNetwork/NetworkDefs.h
548+
Include/GameNetwork/NetworkInterface.h
549+
Include/GameNetwork/networkutil.h
550+
Include/GameNetwork/RankPointValue.h
551+
Include/GameNetwork/Transport.h
552+
Include/GameNetwork/udp.h
553+
Include/GameNetwork/User.h
554+
Include/GameNetwork/WOLBrowser/FEBDispatch.h
555+
Include/GameNetwork/WOLBrowser/WebBrowser.h
556556
# Include/Precompiled/PreRTS.h
557557
Source/Common/Audio/AudioEventRTS.cpp
558558
Source/Common/Audio/AudioRequest.cpp
@@ -1091,17 +1091,17 @@ set(GAMEENGINE_SRC
10911091
# Source/GameLogic/System/GameLogic.cpp
10921092
# Source/GameLogic/System/GameLogicDispatch.cpp
10931093
# Source/GameLogic/System/RankInfo.cpp
1094-
# Source/GameNetwork/Connection.cpp
1094+
Source/GameNetwork/Connection.cpp
10951095
# Source/GameNetwork/ConnectionManager.cpp
1096-
# Source/GameNetwork/DisconnectManager.cpp
1097-
# Source/GameNetwork/DownloadManager.cpp
1098-
# Source/GameNetwork/FileTransfer.cpp
1096+
Source/GameNetwork/DisconnectManager.cpp
1097+
Source/GameNetwork/DownloadManager.cpp
1098+
Source/GameNetwork/FileTransfer.cpp
10991099
# Source/GameNetwork/FirewallHelper.cpp
1100-
# Source/GameNetwork/FrameData.cpp
1101-
# Source/GameNetwork/FrameDataManager.cpp
1102-
# Source/GameNetwork/FrameMetrics.cpp
1100+
Source/GameNetwork/FrameData.cpp
1101+
Source/GameNetwork/FrameDataManager.cpp
1102+
Source/GameNetwork/FrameMetrics.cpp
11031103
# Source/GameNetwork/GameInfo.cpp
1104-
# Source/GameNetwork/GameMessageParser.cpp
1104+
Source/GameNetwork/GameMessageParser.cpp
11051105
#Source/GameNetwork/GameSpyChat.cpp # unused
11061106
#Source/GameNetwork/GameSpyGameInfo.cpp # unused
11071107
#Source/GameNetwork/GameSpyGP.cpp # unused
@@ -1118,26 +1118,26 @@ set(GAMEENGINE_SRC
11181118
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
11191119
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
11201120
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
1121-
# Source/GameNetwork/GameSpyOverlay.cpp
1121+
Source/GameNetwork/GameSpyOverlay.cpp
11221122
# Source/GameNetwork/GUIUtil.cpp
1123-
# Source/GameNetwork/IPEnumeration.cpp
1123+
Source/GameNetwork/IPEnumeration.cpp
11241124
# Source/GameNetwork/LANAPI.cpp
11251125
# Source/GameNetwork/LANAPICallbacks.cpp
11261126
# Source/GameNetwork/LANAPIhandlers.cpp
1127-
# Source/GameNetwork/LANGameInfo.cpp
1128-
# Source/GameNetwork/NAT.cpp
1129-
# Source/GameNetwork/NetCommandList.cpp
1130-
# Source/GameNetwork/NetCommandMsg.cpp
1131-
# Source/GameNetwork/NetCommandRef.cpp
1132-
# Source/GameNetwork/NetCommandWrapperList.cpp
1133-
# Source/GameNetwork/NetMessageStream.cpp
1134-
# Source/GameNetwork/NetPacket.cpp
1127+
Source/GameNetwork/LANGameInfo.cpp
1128+
Source/GameNetwork/NAT.cpp
1129+
Source/GameNetwork/NetCommandList.cpp
1130+
Source/GameNetwork/NetCommandMsg.cpp
1131+
Source/GameNetwork/NetCommandRef.cpp
1132+
Source/GameNetwork/NetCommandWrapperList.cpp
1133+
Source/GameNetwork/NetMessageStream.cpp
1134+
Source/GameNetwork/NetPacket.cpp
11351135
# Source/GameNetwork/Network.cpp
1136-
# Source/GameNetwork/NetworkUtil.cpp
1137-
# Source/GameNetwork/Transport.cpp
1138-
# Source/GameNetwork/udp.cpp
1139-
# Source/GameNetwork/User.cpp
1140-
# Source/GameNetwork/WOLBrowser/WebBrowser.cpp
1136+
Source/GameNetwork/NetworkUtil.cpp
1137+
Source/GameNetwork/Transport.cpp
1138+
Source/GameNetwork/udp.cpp
1139+
Source/GameNetwork/User.cpp
1140+
Source/GameNetwork/WOLBrowser/WebBrowser.cpp
11411141
# Source/Precompiled/PreRTS.cpp
11421142
)
11431143

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/Connection.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/ConnectionManager.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/DownloadManager.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/FileTransfer.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/FirewallHelper.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/FrameData.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/FrameDataManager.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/FrameMetrics.h‎

File renamed without changes.

‎GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h‎ renamed to ‎Core/GameEngine/Include/GameNetwork/GameMessageParser.h‎

File renamed without changes.

0 commit comments

Comments
 (0)