Skip to content

Commit a20280d

Browse files
bobtistabobtista
committed
fix(unify): Move obsolete GameSpy files (GameSpyChat, GameSpyGP, GameSpyGameInfo) back to Generals-only
1 parent 5ae8963 commit a20280d

File tree

9 files changed

+53
-121
lines changed

9 files changed

+53
-121
lines changed

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,9 @@ set(GAMEENGINE_SRC
527527
Include/GameNetwork/GameSpy/PingThread.h
528528
Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
529529
Include/GameNetwork/GameSpy/ThreadUtils.h
530-
Include/GameNetwork/GameSpyChat.h
531-
Include/GameNetwork/GameSpyGameInfo.h
532-
Include/GameNetwork/GameSpyGP.h
530+
# Include/GameNetwork/GameSpyChat.h # unused
531+
# Include/GameNetwork/GameSpyGameInfo.h # unused
532+
# Include/GameNetwork/GameSpyGP.h # unused
533533
Include/GameNetwork/GameSpyOverlay.h
534534
Include/GameNetwork/GameSpyThread.h
535535
# Include/GameNetwork/GUIUtil.h
@@ -1102,9 +1102,9 @@ set(GAMEENGINE_SRC
11021102
Source/GameNetwork/FrameMetrics.cpp
11031103
Source/GameNetwork/GameInfo.cpp
11041104
Source/GameNetwork/GameMessageParser.cpp
1105-
Source/GameNetwork/GameSpyChat.cpp # unused
1106-
Source/GameNetwork/GameSpyGameInfo.cpp # unused
1107-
Source/GameNetwork/GameSpyGP.cpp # unused
1105+
#Source/GameNetwork/GameSpyChat.cpp # unused
1106+
#Source/GameNetwork/GameSpyGameInfo.cpp # unused
1107+
#Source/GameNetwork/GameSpyGP.cpp # unused
11081108
Source/GameNetwork/GameSpy/Chat.cpp
11091109
Source/GameNetwork/GameSpy/GSConfig.cpp
11101110
Source/GameNetwork/GameSpy/LadderDefs.cpp

‎Generals/Code/GameEngine/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,9 @@ set(GAMEENGINE_SRC
484484
# Include/GameNetwork/GameSpy/PingThread.h
485485
# Include/GameNetwork/GameSpy/StagingRoomGameInfo.h
486486
# Include/GameNetwork/GameSpy/ThreadUtils.h
487-
# Include/GameNetwork/GameSpyChat.h
488-
# Include/GameNetwork/GameSpyGameInfo.h
489-
# Include/GameNetwork/GameSpyGP.h
487+
Include/GameNetwork/GameSpyChat.h
488+
Include/GameNetwork/GameSpyGameInfo.h
489+
Include/GameNetwork/GameSpyGP.h
490490
# Include/GameNetwork/GameSpyOverlay.h
491491
Include/GameNetwork/GameSpyPersistentStorage.h
492492
# Include/GameNetwork/GameSpyThread.h
@@ -1017,9 +1017,9 @@ set(GAMEENGINE_SRC
10171017
# Source/GameNetwork/GameInfo.cpp
10181018
# Source/GameNetwork/GameMessageParser.cpp
10191019
#Source/GameNetwork/GameSpy.cpp
1020-
# #Source/GameNetwork/GameSpyChat.cpp
1021-
# #Source/GameNetwork/GameSpyGameInfo.cpp
1022-
# #Source/GameNetwork/GameSpyGP.cpp
1020+
#Source/GameNetwork/GameSpyChat.cpp
1021+
#Source/GameNetwork/GameSpyGameInfo.cpp
1022+
#Source/GameNetwork/GameSpyGP.cpp
10231023
#Source/GameNetwork/GameSpyPersistentStorage.cpp
10241024
# Source/GameNetwork/GameSpy/Chat.cpp
10251025
# Source/GameNetwork/GameSpy/GSConfig.cpp

Core/GameEngine/Include/GameNetwork/GameSpyChat.h renamed to Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Command & Conquer Generals Zero Hour(tm)
2+
** Command & Conquer Generals(tm)
33
** Copyright 2025 Electronic Arts Inc.
44
**
55
** This program is free software: you can redistribute it and/or modify

Core/GameEngine/Include/GameNetwork/GameSpyGP.h renamed to Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Command & Conquer Generals Zero Hour(tm)
2+
** Command & Conquer Generals(tm)
33
** Copyright 2025 Electronic Arts Inc.
44
**
55
** This program is free software: you can redistribute it and/or modify

Core/GameEngine/Include/GameNetwork/GameSpyGameInfo.h renamed to Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
** Command & Conquer Generals Zero Hour(tm)
2+
** Command & Conquer Generals(tm)
33
** Copyright 2025 Electronic Arts Inc.
44
**
55
** This program is free software: you can redistribute it and/or modify

Core/GameEngine/Source/GameNetwork/GameSpyChat.cpp renamed to Generals/Code/GameEngine/Source/GameNetwork/GameSpyChat.cpp

File renamed without changes.

Core/GameEngine/Source/GameNetwork/GameSpyGP.cpp renamed to Generals/Code/GameEngine/Source/GameNetwork/GameSpyGP.cpp

File renamed without changes.

Core/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp renamed to Generals/Code/GameEngine/Source/GameNetwork/GameSpyGameInfo.cpp

File renamed without changes.

‎scripts/cpp/unify_move_files.py‎

Lines changed: 38 additions & 106 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)