Skip to content

Commit 699f9fd

Browse files
vitimitivitimiti
authored
Merge branch 'TheSuperHackers:main' into double_semicolon_refactor
2 parents 49dcd9a + 35b3f01 commit 699f9fd

File tree

301 files changed

+1327
-42385
lines changed

Some content is hidden

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

301 files changed

+1327
-42385
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 96 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
set(GAMEENGINE_SRC
22
# Include/Common/AcademyStats.h
33
# Include/Common/ActionManager.h
4+
Include/Common/AddonCompat.h
45
Include/Common/ArchiveFile.h
56
Include/Common/ArchiveFileSystem.h
67
Include/Common/AsciiString.h
@@ -501,59 +502,60 @@ set(GAMEENGINE_SRC
501502
# Include/GameLogic/WeaponSetFlags.h
502503
# Include/GameLogic/WeaponSetType.h
503504
# Include/GameLogic/WeaponStatus.h
504-
# Include/GameNetwork/Connection.h
505-
# Include/GameNetwork/ConnectionManager.h
506-
# 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
513-
# 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
518-
# Include/GameNetwork/GameSpy/GSConfig.h
519-
# Include/GameNetwork/GameSpy/LadderDefs.h
520-
# Include/GameNetwork/GameSpy/LobbyUtils.h
521-
# Include/GameNetwork/GameSpy/MainMenuUtils.h
522-
# Include/GameNetwork/GameSpy/PeerDefs.h
523-
# Include/GameNetwork/GameSpy/PeerDefsImplementation.h
524-
# Include/GameNetwork/GameSpy/PeerThread.h
525-
# Include/GameNetwork/GameSpy/PersistentStorageDefs.h
526-
# 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
505+
Include/GameNetwork/Connection.h
506+
Include/GameNetwork/ConnectionManager.h
507+
Include/GameNetwork/DisconnectManager.h
508+
Include/GameNetwork/DownloadManager.h
509+
Include/GameNetwork/FileTransfer.h
510+
Include/GameNetwork/FirewallHelper.h
511+
Include/GameNetwork/FrameData.h
512+
Include/GameNetwork/FrameDataManager.h
513+
Include/GameNetwork/FrameMetrics.h
514+
Include/GameNetwork/GameInfo.h
515+
Include/GameNetwork/GameMessageParser.h
516+
Include/GameNetwork/GameSpy/BuddyDefs.h
517+
Include/GameNetwork/GameSpy/BuddyThread.h
518+
Include/GameNetwork/GameSpy/GameResultsThread.h
519+
Include/GameNetwork/GameSpy/GSConfig.h
520+
Include/GameNetwork/GameSpy/LadderDefs.h
521+
Include/GameNetwork/GameSpy/LobbyUtils.h
522+
Include/GameNetwork/GameSpy/MainMenuUtils.h
523+
Include/GameNetwork/GameSpy/PeerDefs.h
524+
Include/GameNetwork/GameSpy/PeerDefsImplementation.h
525+
Include/GameNetwork/GameSpy/PeerThread.h
526+
Include/GameNetwork/GameSpy/PersistentStorageDefs.h
527+
Include/GameNetwork/GameSpy/PersistentStorageThread.h
528+
Include/GameNetwork/GameSpy/PingThread.h
529+
Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
530+
Include/GameNetwork/GameSpy/ThreadUtils.h
531+
# Include/GameNetwork/GameSpyChat.h # unused
532+
# Include/GameNetwork/GameSpyGameInfo.h # unused
533+
# Include/GameNetwork/GameSpyGP.h # unused
534+
Include/GameNetwork/GameSpyOverlay.h
535+
Include/GameNetwork/GameSpyThread.h
535536
# 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
537+
Include/GameNetwork/IPEnumeration.h
538+
Include/GameNetwork/LANAPI.h
539+
Include/GameNetwork/LANAPICallbacks.h
540+
Include/GameNetwork/LANGameInfo.h
541+
Include/GameNetwork/LANPlayer.h
542+
Include/GameNetwork/NAT.h
543+
Include/GameNetwork/NetCommandList.h
544+
Include/GameNetwork/NetCommandMsg.h
545+
Include/GameNetwork/NetCommandRef.h
546+
Include/GameNetwork/NetCommandWrapperList.h
547+
Include/GameNetwork/NetPacket.h
548+
Include/GameNetwork/NetworkDefs.h
549+
Include/GameNetwork/NetworkInterface.h
550+
Include/GameNetwork/networkutil.h
551+
Include/GameNetwork/RankPointValue.h
552+
Include/GameNetwork/Transport.h
553+
Include/GameNetwork/udp.h
554+
Include/GameNetwork/User.h
555+
Include/GameNetwork/WOLBrowser/FEBDispatch.h
556+
Include/GameNetwork/WOLBrowser/WebBrowser.h
556557
# Include/Precompiled/PreRTS.h
558+
Source/Common/AddonCompat.cpp
557559
Source/Common/Audio/AudioEventRTS.cpp
558560
Source/Common/Audio/AudioRequest.cpp
559561
Source/Common/Audio/DynamicAudioEventInfo.cpp
@@ -1091,53 +1093,53 @@ set(GAMEENGINE_SRC
10911093
# Source/GameLogic/System/GameLogic.cpp
10921094
# Source/GameLogic/System/GameLogicDispatch.cpp
10931095
# Source/GameLogic/System/RankInfo.cpp
1094-
# Source/GameNetwork/Connection.cpp
1095-
# Source/GameNetwork/ConnectionManager.cpp
1096-
# Source/GameNetwork/DisconnectManager.cpp
1097-
# Source/GameNetwork/DownloadManager.cpp
1098-
# Source/GameNetwork/FileTransfer.cpp
1099-
# Source/GameNetwork/FirewallHelper.cpp
1100-
# Source/GameNetwork/FrameData.cpp
1101-
# Source/GameNetwork/FrameDataManager.cpp
1102-
# Source/GameNetwork/FrameMetrics.cpp
1103-
# Source/GameNetwork/GameInfo.cpp
1104-
# Source/GameNetwork/GameMessageParser.cpp
1096+
Source/GameNetwork/Connection.cpp
1097+
Source/GameNetwork/ConnectionManager.cpp
1098+
Source/GameNetwork/DisconnectManager.cpp
1099+
Source/GameNetwork/DownloadManager.cpp
1100+
Source/GameNetwork/FileTransfer.cpp
1101+
Source/GameNetwork/FirewallHelper.cpp
1102+
Source/GameNetwork/FrameData.cpp
1103+
Source/GameNetwork/FrameDataManager.cpp
1104+
Source/GameNetwork/FrameMetrics.cpp
1105+
Source/GameNetwork/GameInfo.cpp
1106+
Source/GameNetwork/GameMessageParser.cpp
11051107
#Source/GameNetwork/GameSpyChat.cpp # unused
11061108
#Source/GameNetwork/GameSpyGameInfo.cpp # unused
11071109
#Source/GameNetwork/GameSpyGP.cpp # unused
1108-
# Source/GameNetwork/GameSpy/Chat.cpp
1109-
# Source/GameNetwork/GameSpy/GSConfig.cpp
1110-
# Source/GameNetwork/GameSpy/LadderDefs.cpp
1111-
# Source/GameNetwork/GameSpy/LobbyUtils.cpp
1112-
# Source/GameNetwork/GameSpy/MainMenuUtils.cpp
1113-
# Source/GameNetwork/GameSpy/PeerDefs.cpp
1114-
# Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
1115-
# Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
1116-
# Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
1117-
# Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
1118-
# Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
1119-
# Source/GameNetwork/GameSpy/Thread/PingThread.cpp
1120-
# Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
1121-
# Source/GameNetwork/GameSpyOverlay.cpp
1110+
Source/GameNetwork/GameSpy/Chat.cpp
1111+
Source/GameNetwork/GameSpy/GSConfig.cpp
1112+
Source/GameNetwork/GameSpy/LadderDefs.cpp
1113+
Source/GameNetwork/GameSpy/LobbyUtils.cpp
1114+
Source/GameNetwork/GameSpy/MainMenuUtils.cpp
1115+
Source/GameNetwork/GameSpy/PeerDefs.cpp
1116+
Source/GameNetwork/GameSpy/StagingRoomGameInfo.cpp
1117+
Source/GameNetwork/GameSpy/Thread/BuddyThread.cpp
1118+
Source/GameNetwork/GameSpy/Thread/GameResultsThread.cpp
1119+
Source/GameNetwork/GameSpy/Thread/PeerThread.cpp
1120+
Source/GameNetwork/GameSpy/Thread/PersistentStorageThread.cpp
1121+
Source/GameNetwork/GameSpy/Thread/PingThread.cpp
1122+
Source/GameNetwork/GameSpy/Thread/ThreadUtils.cpp
1123+
Source/GameNetwork/GameSpyOverlay.cpp
11221124
# Source/GameNetwork/GUIUtil.cpp
1123-
# Source/GameNetwork/IPEnumeration.cpp
1124-
# Source/GameNetwork/LANAPI.cpp
1125-
# Source/GameNetwork/LANAPICallbacks.cpp
1126-
# 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
1135-
# 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
1125+
Source/GameNetwork/IPEnumeration.cpp
1126+
Source/GameNetwork/LANAPI.cpp
1127+
Source/GameNetwork/LANAPICallbacks.cpp
1128+
Source/GameNetwork/LANAPIhandlers.cpp
1129+
Source/GameNetwork/LANGameInfo.cpp
1130+
Source/GameNetwork/NAT.cpp
1131+
Source/GameNetwork/NetCommandList.cpp
1132+
Source/GameNetwork/NetCommandMsg.cpp
1133+
Source/GameNetwork/NetCommandRef.cpp
1134+
Source/GameNetwork/NetCommandWrapperList.cpp
1135+
Source/GameNetwork/NetMessageStream.cpp
1136+
Source/GameNetwork/NetPacket.cpp
1137+
Source/GameNetwork/Network.cpp
1138+
Source/GameNetwork/NetworkUtil.cpp
1139+
Source/GameNetwork/Transport.cpp
1140+
Source/GameNetwork/udp.cpp
1141+
Source/GameNetwork/User.cpp
1142+
Source/GameNetwork/WOLBrowser/WebBrowser.cpp
11411143
# Source/Precompiled/PreRTS.cpp
11421144
)
11431145

Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h renamed to Core/GameEngine/Include/Common/AddonCompat.h

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
** Command & Conquer Generals(tm)
3-
** Copyright 2025 Electronic Arts Inc.
2+
** Command & Conquer Generals Zero Hour(tm)
3+
** Copyright 2025 TheSuperHackers
44
**
55
** This program is free software: you can redistribute it and/or modify
66
** it under the terms of the GNU General Public License as published by
@@ -16,17 +16,10 @@
1616
** along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
*/
1818

19-
////////////////////////////////////////////////////////////////////////////////
20-
// //
21-
// (c) 2001-2003 Electronic Arts Inc. //
22-
// //
23-
////////////////////////////////////////////////////////////////////////////////
24-
25-
// FILE: BuddyDefs.h //////////////////////////////////////////////////////
26-
// Generals GameSpy Buddy (GP) definitions
27-
// Author: Matthew D. Campbell, July 2002
28-
2919
#pragma once
3020

31-
void HandleBuddyResponses(void);
32-
void PopulateOldBuddyMessages(void);
21+
namespace addon
22+
{
23+
extern Bool HasFullviewportDat();
24+
25+
} // namespace addon

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/DisconnectManager.h renamed to Core/GameEngine/Include/GameNetwork/DisconnectManager.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.

0 commit comments

Comments
 (0)