Skip to content

Commit 4e33820

Browse files
CookieLandProjectsCookieLandProjects
committed
Updating
2 parents 6d52158 + 0d746e5 commit 4e33820

2,396 files changed

Lines changed: 24670 additions & 75390 deletions

File tree

Some content is hidden

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

‎CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ if (IS_VS6_BUILD)
7272
add_subdirectory(Dependencies/MaxSDK)
7373
endif()
7474
add_subdirectory(Dependencies/Utility)
75+
76+
# To be removed when abandoning VC6
77+
if (IS_VS6_BUILD)
78+
include_directories(Dependencies/Utility)
79+
add_compile_options(/FIUtility/CppMacros.h)
80+
endif()
81+
7582
add_subdirectory(resources)
7683

7784
add_subdirectory(Core)

‎Core/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libra
1414
target_include_directories(corei_main INTERFACE "Main")
1515

1616
target_sources(corei_libraries_include PRIVATE
17+
Libraries/Include/Lib/BaseType.h
1718
Libraries/Include/Lib/BaseTypeCore.h
19+
Libraries/Include/Lib/trig.h
1820
Libraries/Include/rts/debug.h
1921
Libraries/Include/rts/profile.h
2022
)

‎Core/GameEngine/CMakeLists.txt‎

Lines changed: 72 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ set(GAMEENGINE_SRC
1919
# Include/Common/BitFlagsIO.h
2020
# Include/Common/BorderColors.h
2121
# Include/Common/BuildAssistant.h
22-
# Include/Common/CDManager.h
2322
# Include/Common/ClientUpdateModule.h
2423
# Include/Common/CommandLine.h
2524
Include/Common/crc.h
@@ -37,14 +36,14 @@ set(GAMEENGINE_SRC
3736
Include/Common/DynamicAudioEventInfo.h
3837
# Include/Common/encrypt.h
3938
# Include/Common/Energy.h
40-
# Include/Common/Errors.h
39+
Include/Common/Errors.h
4140
Include/Common/file.h
4241
Include/Common/FileSystem.h
4342
Include/Common/FramePacer.h
4443
Include/Common/FrameRateLimit.h
4544
# Include/Common/FunctionLexicon.h
4645
Include/Common/GameAudio.h
47-
# Include/Common/GameCommon.h
46+
Include/Common/GameCommon.h
4847
Include/Common/GameDefines.h
4948
# Include/Common/GameEngine.h
5049
# Include/Common/GameLOD.h
@@ -54,13 +53,13 @@ set(GAMEENGINE_SRC
5453
# Include/Common/GameSpyMiscPreferences.h
5554
# Include/Common/GameState.h
5655
# Include/Common/GameStateMap.h
57-
# Include/Common/GameType.h
56+
Include/Common/GameType.h
5857
Include/Common/GameUtility.h
5958
# Include/Common/Geometry.h
6059
# Include/Common/GlobalData.h
6160
# Include/Common/Handicap.h
6261
# Include/Common/IgnorePreferences.h
63-
# Include/Common/INI.h
62+
Include/Common/INI.h
6463
# Include/Common/INIException.h
6564
# Include/Common/KindOf.h
6665
# Include/Common/LadderPreferences.h
@@ -83,6 +82,7 @@ set(GAMEENGINE_SRC
8382
# Include/Common/MultiplayerSettings.h
8483
# Include/Common/NameKeyGenerator.h
8584
Include/Common/ObjectStatusTypes.h
85+
Include/Common/OptionPreferences.h
8686
# Include/Common/OSDisplay.h
8787
# Include/Common/Overridable.h
8888
# Include/Common/Override.h
@@ -108,17 +108,17 @@ set(GAMEENGINE_SRC
108108
#Include/Common/simpleplayer.h # unused
109109
# Include/Common/SkirmishBattleHonors.h
110110
# Include/Common/SkirmishPreferences.h
111-
# Include/Common/Snapshot.h
111+
Include/Common/Snapshot.h
112112
# Include/Common/SparseMatchFinder.h
113113
# Include/Common/SpecialPower.h
114114
# Include/Common/SpecialPowerMaskType.h
115115
# Include/Common/SpecialPowerType.h
116116
# Include/Common/StackDump.h
117117
# Include/Common/StateMachine.h
118118
# Include/Common/StatsCollector.h
119-
# Include/Common/STLTypedefs.h
119+
Include/Common/STLTypedefs.h
120120
Include/Common/StreamingArchiveFile.h
121-
# Include/Common/SubsystemInterface.h
121+
Include/Common/SubsystemInterface.h
122122
# Include/Common/SystemInfo.h
123123
# Include/Common/Team.h
124124
# Include/Common/Terrain.h
@@ -144,30 +144,29 @@ set(GAMEENGINE_SRC
144144
# Include/GameClient/Anim2D.h
145145
# Include/GameClient/AnimateWindowManager.h
146146
# Include/GameClient/CampaignManager.h
147-
# Include/GameClient/CDCheck.h
148-
# Include/GameClient/ChallengeGenerals.h
149-
# Include/GameClient/ClientInstance.h
147+
Include/GameClient/ChallengeGenerals.h
148+
Include/GameClient/ClientInstance.h
150149
Include/GameClient/ClientRandomValue.h
151-
# Include/GameClient/Color.h
150+
Include/GameClient/Color.h
152151
# Include/GameClient/CommandXlat.h
153152
# Include/GameClient/ControlBar.h
154153
# Include/GameClient/ControlBarResizer.h
155154
# Include/GameClient/ControlBarScheme.h
156-
# Include/GameClient/Credits.h
155+
Include/GameClient/Credits.h
157156
# Include/GameClient/DebugDisplay.h
158157
# Include/GameClient/Diplomacy.h
159158
# Include/GameClient/DisconnectMenu.h
160159
# Include/GameClient/Display.h
161-
# Include/GameClient/DisplayString.h
162-
# Include/GameClient/DisplayStringManager.h
160+
Include/GameClient/DisplayString.h
161+
Include/GameClient/DisplayStringManager.h
163162
# Include/GameClient/Drawable.h
164163
# Include/GameClient/DrawableInfo.h
165-
# Include/GameClient/DrawGroupInfo.h
164+
Include/GameClient/DrawGroupInfo.h
166165
# Include/GameClient/EstablishConnectionsMenu.h
167166
# Include/GameClient/Eva.h
168167
# Include/GameClient/ExtendedMessageBox.h
169168
# Include/GameClient/FontDesc.h
170-
# Include/GameClient/FXList.h
169+
Include/GameClient/FXList.h
171170
# Include/GameClient/Gadget.h
172171
# Include/GameClient/GadgetCheckBox.h
173172
# Include/GameClient/GadgetComboBox.h
@@ -180,61 +179,61 @@ set(GAMEENGINE_SRC
180179
# Include/GameClient/GadgetTabControl.h
181180
# Include/GameClient/GadgetTextEntry.h
182181
# Include/GameClient/GameClient.h
183-
# Include/GameClient/GameFont.h
182+
Include/GameClient/GameFont.h
184183
# Include/GameClient/GameInfoWindow.h
185-
# Include/GameClient/GameText.h
186-
# Include/GameClient/GameWindow.h
187-
# Include/GameClient/GameWindowGlobal.h
184+
Include/GameClient/GameText.h
185+
Include/GameClient/GameWindow.h
186+
Include/GameClient/GameWindowGlobal.h
188187
# Include/GameClient/GameWindowID.h
189188
# Include/GameClient/GameWindowManager.h
190-
# Include/GameClient/GameWindowTransitions.h
191-
# Include/GameClient/GlobalLanguage.h
192-
# Include/GameClient/GraphDraw.h
189+
Include/GameClient/GameWindowTransitions.h
190+
Include/GameClient/GlobalLanguage.h
191+
Include/GameClient/GraphDraw.h
193192
# Include/GameClient/GUICallbacks.h
194193
# Include/GameClient/GUICommandTranslator.h
195-
# Include/GameClient/HeaderTemplate.h
194+
Include/GameClient/HeaderTemplate.h
196195
# Include/GameClient/HintSpy.h
197196
# Include/GameClient/HotKey.h
198197
# Include/GameClient/Image.h
199-
# Include/GameClient/IMEManager.h
198+
Include/GameClient/IMEManager.h
200199
# Include/GameClient/InGameUI.h
201-
# Include/GameClient/Keyboard.h
200+
Include/GameClient/Keyboard.h
202201
# Include/GameClient/KeyDefs.h
203-
# Include/GameClient/LanguageFilter.h
204-
# Include/GameClient/Line2D.h
205-
# Include/GameClient/LoadScreen.h
202+
Include/GameClient/LanguageFilter.h
203+
Include/GameClient/Line2D.h
204+
Include/GameClient/LoadScreen.h
206205
# Include/GameClient/LookAtXlat.h
207206
Include/GameClient/MapUtil.h
208207
# Include/GameClient/MessageBox.h
209208
# Include/GameClient/MetaEvent.h
210209
# Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h
211210
# Include/GameClient/Module/BeaconClientUpdate.h
212211
# Include/GameClient/Module/SwayClientUpdate.h
213-
# Include/GameClient/Mouse.h
212+
Include/GameClient/Mouse.h
214213
Include/GameClient/ParabolicEase.h
215-
# Include/GameClient/ParticleSys.h
214+
Include/GameClient/ParticleSys.h
216215
# Include/GameClient/PlaceEventTranslator.h
217-
# Include/GameClient/ProcessAnimateWindow.h
218-
# Include/GameClient/RadiusDecal.h
216+
Include/GameClient/ProcessAnimateWindow.h
217+
Include/GameClient/RadiusDecal.h
219218
# Include/GameClient/RayEffect.h
220-
# Include/GameClient/SelectionInfo.h
219+
Include/GameClient/SelectionInfo.h
221220
# Include/GameClient/SelectionXlat.h
222221
# Include/GameClient/Shadow.h
223222
# Include/GameClient/Shell.h
224223
# Include/GameClient/ShellHooks.h
225224
# Include/GameClient/ShellMenuScheme.h
226225
Include/GameClient/Smudge.h
227226
Include/GameClient/Snow.h
228-
# Include/GameClient/Statistics.h
227+
Include/GameClient/Statistics.h
229228
Include/GameClient/TerrainRoads.h
230229
Include/GameClient/TerrainVisual.h
231230
Include/GameClient/VideoPlayer.h
232231
Include/GameClient/View.h
233232
Include/GameClient/Water.h
234-
# Include/GameClient/WindowLayout.h
233+
Include/GameClient/WindowLayout.h
235234
Include/GameClient/WindowVideoManager.h
236235
# Include/GameClient/WindowXlat.h
237-
# Include/GameClient/WinInstanceData.h
236+
Include/GameClient/WinInstanceData.h
238237
# Include/GameLogic/AI.h
239238
# Include/GameLogic/AIDock.h
240239
# Include/GameLogic/AIGuard.h
@@ -582,7 +581,7 @@ set(GAMEENGINE_SRC
582581
# Source/Common/GameMain.cpp
583582
Source/Common/GameUtility.cpp
584583
# Source/Common/GlobalData.cpp
585-
# Source/Common/INI/INI.cpp
584+
Source/Common/INI/INI.cpp
586585
# Source/Common/INI/INIAiData.cpp
587586
# Source/Common/INI/INIAnimation.cpp
588587
Source/Common/INI/INIAudioEventInfo.cpp
@@ -615,6 +614,7 @@ set(GAMEENGINE_SRC
615614
# Source/Common/MiniLog.cpp
616615
# Source/Common/MultiplayerSettings.cpp
617616
# Source/Common/NameKeyGenerator.cpp
617+
Source/Common/OptionPreferences.cpp
618618
# Source/Common/PartitionSolver.cpp
619619
# Source/Common/PerfTimer.cpp
620620
Source/Common/RandomValue.cpp
@@ -643,7 +643,6 @@ set(GAMEENGINE_SRC
643643
Source/Common/System/ArchiveFileSystem.cpp
644644
Source/Common/System/AsciiString.cpp
645645
# Source/Common/System/BuildAssistant.cpp
646-
# Source/Common/System/CDManager.cpp
647646
# Source/Common/System/CriticalSection.cpp
648647
# Source/Common/System/DataChunk.cpp
649648
Source/Common/System/Debug.cpp
@@ -653,10 +652,10 @@ set(GAMEENGINE_SRC
653652
Source/Common/System/File.cpp
654653
Source/Common/System/FileSystem.cpp
655654
# Source/Common/System/FunctionLexicon.cpp
656-
# Source/Common/System/GameCommon.cpp
655+
Source/Common/System/GameCommon.cpp
657656
#Source/Common/System/GameMemory.cpp # is conditionally appended
658657
#Source/Common/System/GameMemoryInit.cpp # is conditionally appended
659-
# Source/Common/System/GameType.cpp
658+
Source/Common/System/GameType.cpp
660659
# Source/Common/System/Geometry.cpp
661660
# Source/Common/System/KindOf.cpp
662661
# Source/Common/System/List.cpp
@@ -670,10 +669,10 @@ set(GAMEENGINE_SRC
670669
# Source/Common/System/registry.cpp
671670
# Source/Common/System/SaveGame/GameState.cpp
672671
# Source/Common/System/SaveGame/GameStateMap.cpp
673-
# Source/Common/System/Snapshot.cpp
672+
Source/Common/System/Snapshot.cpp
674673
# Source/Common/System/StackDump.cpp
675674
Source/Common/System/StreamingArchiveFile.cpp
676-
# Source/Common/System/SubsystemInterface.cpp
675+
Source/Common/System/SubsystemInterface.cpp
677676
# Source/Common/System/Trig.cpp
678677
Source/Common/System/UnicodeString.cpp
679678
# Source/Common/System/Upgrade.cpp
@@ -691,26 +690,26 @@ set(GAMEENGINE_SRC
691690
Source/Common/UserPreferences.cpp
692691
# Source/Common/version.cpp
693692
Source/Common/WorkerProcess.cpp
694-
# Source/GameClient/ClientInstance.cpp
695-
# Source/GameClient/Color.cpp
696-
# Source/GameClient/Credits.cpp
693+
Source/GameClient/ClientInstance.cpp
694+
Source/GameClient/Color.cpp
695+
Source/GameClient/Credits.cpp
697696
# Source/GameClient/Display.cpp
698-
# Source/GameClient/DisplayString.cpp
699-
# Source/GameClient/DisplayStringManager.cpp
697+
Source/GameClient/DisplayString.cpp
698+
Source/GameClient/DisplayStringManager.cpp
700699
# Source/GameClient/Drawable.cpp
701700
# Source/GameClient/Drawable/Update/AnimatedParticleSysBoneClientUpdate.cpp
702701
# Source/GameClient/Drawable/Update/BeaconClientUpdate.cpp
703702
# Source/GameClient/Drawable/Update/SwayClientUpdate.cpp
704-
# Source/GameClient/DrawGroupInfo.cpp
703+
Source/GameClient/DrawGroupInfo.cpp
705704
# Source/GameClient/Eva.cpp
706-
# Source/GameClient/FXList.cpp
705+
Source/GameClient/FXList.cpp
707706
# Source/GameClient/GameClient.cpp
708707
# Source/GameClient/GameClientDispatch.cpp
709-
# Source/GameClient/GameText.cpp
710-
# Source/GameClient/GlobalLanguage.cpp
711-
# Source/GameClient/GraphDraw.cpp
708+
Source/GameClient/GameText.cpp
709+
Source/GameClient/GlobalLanguage.cpp
710+
Source/GameClient/GraphDraw.cpp
712711
# Source/GameClient/GUI/AnimateWindowManager.cpp
713-
# Source/GameClient/GUI/ChallengeGenerals.cpp
712+
Source/GameClient/GUI/ChallengeGenerals.cpp
714713
# Source/GameClient/GUI/ControlBar/ControlBar.cpp
715714
# Source/GameClient/GUI/ControlBar/ControlBarBeacon.cpp
716715
# Source/GameClient/GUI/ControlBar/ControlBarCommand.cpp
@@ -736,12 +735,12 @@ set(GAMEENGINE_SRC
736735
# Source/GameClient/GUI/Gadget/GadgetTabControl.cpp
737736
# Source/GameClient/GUI/Gadget/GadgetTextEntry.cpp
738737
# Source/GameClient/GUI/Gadget/GadgetVerticalSlider.cpp
739-
# Source/GameClient/GUI/GameFont.cpp
740-
# Source/GameClient/GUI/GameWindow.cpp
741-
# Source/GameClient/GUI/GameWindowGlobal.cpp
738+
Source/GameClient/GUI/GameFont.cpp
739+
Source/GameClient/GUI/GameWindow.cpp
740+
Source/GameClient/GUI/GameWindowGlobal.cpp
742741
# Source/GameClient/GUI/GameWindowManager.cpp
743742
# Source/GameClient/GUI/GameWindowManagerScript.cpp
744-
# Source/GameClient/GUI/GameWindowTransitions.cpp
743+
Source/GameClient/GUI/GameWindowTransitions.cpp
745744
# Source/GameClient/GUI/GameWindowTransitionsStyles.cpp
746745
# Source/GameClient/GUI/GUICallbacks/ControlBarCallback.cpp
747746
# Source/GameClient/GUI/GUICallbacks/ControlBarPopupDescription.cpp
@@ -794,20 +793,20 @@ set(GAMEENGINE_SRC
794793
# Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
795794
# Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
796795
# Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
797-
# Source/GameClient/GUI/HeaderTemplate.cpp
798-
# Source/GameClient/GUI/IMEManager.cpp
799-
# Source/GameClient/GUI/LoadScreen.cpp
800-
# Source/GameClient/GUI/ProcessAnimateWindow.cpp
796+
Source/GameClient/GUI/HeaderTemplate.cpp
797+
Source/GameClient/GUI/IMEManager.cpp
798+
Source/GameClient/GUI/LoadScreen.cpp
799+
Source/GameClient/GUI/ProcessAnimateWindow.cpp
801800
# Source/GameClient/GUI/Shell/Shell.cpp
802801
# Source/GameClient/GUI/Shell/ShellMenuScheme.cpp
803-
# Source/GameClient/GUI/WindowLayout.cpp
802+
Source/GameClient/GUI/WindowLayout.cpp
804803
Source/GameClient/GUI/WindowVideoManager.cpp
805-
# Source/GameClient/GUI/WinInstanceData.cpp
804+
Source/GameClient/GUI/WinInstanceData.cpp
806805
# Source/GameClient/InGameUI.cpp
807-
# Source/GameClient/Input/Keyboard.cpp
808-
# Source/GameClient/Input/Mouse.cpp
809-
# Source/GameClient/LanguageFilter.cpp
810-
# Source/GameClient/Line2D.cpp
806+
Source/GameClient/Input/Keyboard.cpp
807+
Source/GameClient/Input/Mouse.cpp
808+
Source/GameClient/LanguageFilter.cpp
809+
Source/GameClient/Line2D.cpp
811810
Source/GameClient/MapUtil.cpp
812811
# Source/GameClient/MessageStream/CommandXlat.cpp
813812
# Source/GameClient/MessageStream/GUICommandTranslator.cpp
@@ -819,16 +818,16 @@ set(GAMEENGINE_SRC
819818
# Source/GameClient/MessageStream/SelectionXlat.cpp
820819
# Source/GameClient/MessageStream/WindowXlat.cpp
821820
Source/GameClient/ParabolicEase.cpp
822-
# Source/GameClient/RadiusDecal.cpp
823-
# Source/GameClient/SelectionInfo.cpp
821+
Source/GameClient/RadiusDecal.cpp
822+
Source/GameClient/SelectionInfo.cpp
824823
Source/GameClient/Snow.cpp
825-
# Source/GameClient/Statistics.cpp
824+
Source/GameClient/Statistics.cpp
826825
# Source/GameClient/System/Anim2D.cpp
827826
# Source/GameClient/System/CampaignManager.cpp
828827
Source/GameClient/System/Debug/AudioDebugDisplay.cpp
829828
# Source/GameClient/System/DebugDisplay.cpp
830829
# Source/GameClient/System/Image.cpp
831-
# Source/GameClient/System/ParticleSys.cpp
830+
Source/GameClient/System/ParticleSys.cpp
832831
# Source/GameClient/System/RayEffect.cpp
833832
Source/GameClient/System/Smudge.cpp
834833
Source/GameClient/Terrain/TerrainRoads.cpp

‎Core/GameEngine/Include/Common/ArchiveFile.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ class ArchiveFile
5252

5353
virtual Bool getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0; ///< fill in the fileInfo struct with info about the file requested.
5454
virtual File* openFile( const Char *filename, Int access = 0) = 0; ///< Open the specified file within the archive file
55-
virtual void closeAllFiles( void ) = 0; ///< Close all file opened in this archive file
56-
virtual AsciiString getName( void ) = 0; ///< Returns the name of the archive file
57-
virtual AsciiString getPath( void ) = 0; ///< Returns full path and name of archive file
55+
virtual void closeAllFiles() = 0; ///< Close all file opened in this archive file
56+
virtual AsciiString getName() = 0; ///< Returns the name of the archive file
57+
virtual AsciiString getPath() = 0; ///< Returns full path and name of archive file
5858
virtual void setSearchPriority( Int new_priority ) = 0; ///< Set this archive file's search priority
59-
virtual void close( void ) = 0; ///< Close this archive file
59+
virtual void close() = 0; ///< Close this archive file
6060
void attachFile(File *file);
6161

6262
void getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;

0 commit comments

Comments
 (0)