Merge pull request #27 from GeneralsOnlineDevelopmentTeam/main

main -> 60hz

Author: x64-dev

CMakePresets.json

@@ -34,14 +34,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "vc6-internal",
-            "displayName": "Windows 32bit VC6 Internal",
-            "inherits": "vc6",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "vc6-debug",
             "displayName": "Windows 32bit VC6 Debug",
@@ -103,14 +95,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-internal",
-            "inherits": "win32",
-            "displayName": "Windows 32bit Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-debug",
             "inherits": "win32",
@@ -145,14 +129,6 @@
                 "RTS_BUILD_OPTION_PROFILE": "ON"
             }
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "inherits": "win32-vcpkg",
-            "displayName": "Windows 32bit VCPKG Internal",
-            "cacheVariables": {
-                "RTS_BUILD_OPTION_INTERNAL": "ON"
-            }
-        },
         {
             "name": "win32-vcpkg-debug",
             "inherits": "win32-vcpkg",
@@ -175,12 +151,6 @@
             "displayName": "Build Windows 32bit VC6 Release",
             "description": "Build Windows 32bit VC6 Release"
         },
-        {
-            "name": "vc6-internal",
-            "configurePreset": "vc6-internal",
-            "displayName": "Build Windows 32bit VC6 Internal",
-            "description": "Build Windows 32bit VC6 Internal"
-        },
         {
             "name": "vc6-profile",
             "configurePreset": "vc6-profile",
@@ -200,13 +170,6 @@
             "description": "Build Windows 32bit Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-internal",
-            "configurePreset": "win32-internal",
-            "displayName": "Build Windows 32bit Internal",
-            "description": "Build Windows 32bit Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-profile",
             "configurePreset": "win32-profile",
@@ -228,13 +191,6 @@
             "description": "Build Windows 32bit VCPKG Release",
             "configuration": "Release"
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "configurePreset": "win32-vcpkg-internal",
-            "displayName": "Build Windows 32bit VCPKG Internal",
-            "description": "Build Windows 32bit VCPKG Internal",
-            "configuration": "Release"
-        },
         {
             "name": "win32-vcpkg-profile",
             "configurePreset": "win32-vcpkg-profile",
@@ -284,19 +240,6 @@
                 }
             ]
         },
-        {
-            "name": "vc6-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "vc6-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "vc6-internal"
-                }
-            ]
-        },
         {
             "name": "vc6-profile",
             "steps": [
@@ -323,19 +266,6 @@
                 }
             ]
         },
-        {
-            "name": "win32-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "win32-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "win32-internal"
-                }
-            ]
-        },
         {
             "name": "win32-profile",
             "steps": [
@@ -375,19 +305,6 @@
                 }
             ]
         },
-        {
-            "name": "win32-vcpkg-internal",
-            "steps": [
-                {
-                    "type": "configure",
-                    "name": "win32-vcpkg-internal"
-                },
-                {
-                    "type": "build",
-                    "name": "win32-vcpkg-internal"
-                }
-            ]
-        },
         {
             "name": "win32-vcpkg-profile",
             "steps": [

Core/CMakeLists.txt

@@ -3,15 +3,19 @@ add_library(corei_gameengine_include INTERFACE)
 add_library(corei_libraries_include INTERFACE)
 add_library(corei_libraries_source_wwvegas INTERFACE)
 add_library(corei_libraries_source_wwvegas_wwlib INTERFACE)
+add_library(corei_main INTERFACE)
 add_library(corei_always INTERFACE)
 
 target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
 target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
 target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
 target_include_directories(corei_libraries_source_wwvegas_wwlib INTERFACE "Libraries/Source/WWVegas/WWLib")
+target_include_directories(corei_main INTERFACE "Main")
+
 target_link_libraries(corei_always INTERFACE
     core_utility
     corei_libraries_include
+    resources
 )
 
 # Set where the build results will end up
@@ -24,6 +28,6 @@ add_subdirectory(Libraries)
 add_subdirectory(GameEngine)
 
 # Platform specific GameEngine code
-# add_subdirectory(GameEngineDevice)
+add_subdirectory(GameEngineDevice)
 
 add_subdirectory(Tools)

Core/GameEngine/CMakeLists.txt

@@ -1,8 +1,8 @@
 set(GAMEENGINE_SRC
 #    Include/Common/AcademyStats.h
 #    Include/Common/ActionManager.h
-#    Include/Common/ArchiveFile.h
-#    Include/Common/ArchiveFileSystem.h
+    Include/Common/ArchiveFile.h
+    Include/Common/ArchiveFileSystem.h
 #    Include/Common/AsciiString.h
 #    Include/Common/AudioAffect.h
 #    Include/Common/AudioEventInfo.h
@@ -37,8 +37,8 @@ set(GAMEENGINE_SRC
 #    Include/Common/encrypt.h
 #    Include/Common/Energy.h
 #    Include/Common/Errors.h
-#    Include/Common/file.h
-#    Include/Common/FileSystem.h
+    Include/Common/file.h
+    Include/Common/FileSystem.h
 #    Include/Common/FunctionLexicon.h
 #    Include/Common/GameAudio.h
 #    Include/Common/GameCommon.h
@@ -63,8 +63,8 @@ set(GAMEENGINE_SRC
 #    Include/Common/Language.h
 #    Include/Common/LatchRestore.h
 #    Include/Common/List.h
-#    Include/Common/LocalFile.h
-#    Include/Common/LocalFileSystem.h
+    Include/Common/LocalFile.h
+    Include/Common/LocalFileSystem.h
 #    Include/Common/MapObject.h
 #    Include/Common/MapReaderWriterInfo.h
 #    Include/Common/MessageStream.h
@@ -91,7 +91,7 @@ set(GAMEENGINE_SRC
 #    Include/Common/QuickmatchPreferences.h
 #    Include/Common/QuotedPrintable.h
 #    Include/Common/Radar.h
-#    Include/Common/RAMFile.h
+    Include/Common/RAMFile.h
 #    Include/Common/RandomValue.h
 #    Include/Common/Recorder.h
 #    Include/Common/Registry.h
@@ -112,7 +112,8 @@ set(GAMEENGINE_SRC
 #    Include/Common/StateMachine.h
 #    Include/Common/StatsCollector.h
 #    Include/Common/STLTypedefs.h
-#    Include/Common/StreamingArchiveFile.h
+    Include/Common/STLUtils.h
+    Include/Common/StreamingArchiveFile.h
 #    Include/Common/SubsystemInterface.h
 #    Include/Common/SystemInfo.h
 #    Include/Common/Team.h
@@ -629,8 +630,8 @@ set(GAMEENGINE_SRC
 #    Source/Common/SkirmishBattleHonors.cpp
 #    Source/Common/StateMachine.cpp
 #    Source/Common/StatsCollector.cpp
-#    Source/Common/System/ArchiveFile.cpp
-#    Source/Common/System/ArchiveFileSystem.cpp
+    Source/Common/System/ArchiveFile.cpp
+    Source/Common/System/ArchiveFileSystem.cpp
 #    Source/Common/System/AsciiString.cpp
 #    Source/Common/System/BuildAssistant.cpp
 #    Source/Common/System/CDManager.cpp
@@ -640,28 +641,28 @@ set(GAMEENGINE_SRC
 #    Source/Common/System/Directory.cpp
 #    Source/Common/System/DisabledTypes.cpp
 #    Source/Common/System/encrypt.cpp
-#    Source/Common/System/File.cpp
-#    Source/Common/System/FileSystem.cpp
+    Source/Common/System/File.cpp
+    Source/Common/System/FileSystem.cpp
 #    Source/Common/System/FunctionLexicon.cpp
 #    Source/Common/System/GameCommon.cpp
     #Source/Common/System/GameMemory.cpp # is conditionally appended
 #    Source/Common/System/GameType.cpp
 #    Source/Common/System/Geometry.cpp
 #    Source/Common/System/KindOf.cpp
 #    Source/Common/System/List.cpp
-#    Source/Common/System/LocalFile.cpp
-#    Source/Common/System/LocalFileSystem.cpp
+    Source/Common/System/LocalFile.cpp
+    Source/Common/System/LocalFileSystem.cpp
     #Source/Common/System/MemoryInit.cpp # is conditionally appended
 #    Source/Common/System/ObjectStatusTypes.cpp
 #    Source/Common/System/QuotedPrintable.cpp
 #    Source/Common/System/Radar.cpp
-#    Source/Common/System/RAMFile.cpp
+    Source/Common/System/RAMFile.cpp
 #    Source/Common/System/registry.cpp
 #    Source/Common/System/SaveGame/GameState.cpp
 #    Source/Common/System/SaveGame/GameStateMap.cpp
 #    Source/Common/System/Snapshot.cpp
 #    Source/Common/System/StackDump.cpp
-#    Source/Common/System/StreamingArchiveFile.cpp
+    Source/Common/System/StreamingArchiveFile.cpp
 #    Source/Common/System/SubsystemInterface.cpp
 #    Source/Common/System/Trig.cpp
 #    Source/Common/System/UnicodeString.cpp

…/GameEngine/Include/Common/ArchiveFile.h …/GameEngine/Include/Common/ArchiveFile.hGeneralsMD/Code/GameEngine/Include/Common/ArchiveFile.h renamed to Core/GameEngine/Include/Common/ArchiveFile.h GeneralsMD/Code/GameEngine/Include/Common/ArchiveFile.h renamed to Core/GameEngine/Include/Common/ArchiveFile.h

@@ -40,3 +40,16 @@
 #ifndef ENABLE_GAMETEXT_SUBSTITUTES
 #define ENABLE_GAMETEXT_SUBSTITUTES (1) // The code can provide substitute texts when labels and strings are missing in the STR or CSF translation file
 #endif
+
+// Previously the configurable shroud sat behind #if defined(RTS_DEBUG)
+// Enable the configurable shroud to properly draw the terrain in World Builder without RTS_DEBUG compiled in.
+// Disable the configurable shroud to make shroud hacking a bit less accessible in Release game builds.
+#ifndef ENABLE_CONFIGURABLE_SHROUD
+#define ENABLE_CONFIGURABLE_SHROUD (1) // When enabled, the GlobalData contains a field to turn on/off the shroud, otherwise shroud is always enabled
+#endif
+
+// Enable buffered IO in File System. Was disabled in retail game.
+// Buffered IO generally is much faster than unbuffered for small reads and writes.
+#ifndef USE_BUFFERED_IO
+#define USE_BUFFERED_IO (1)
+#endif

…ngine/Include/Common/ArchiveFileSystem.h …ngine/Include/Common/ArchiveFileSystem.hGeneralsMD/Code/GameEngine/Include/Common/ArchiveFileSystem.h renamed to Core/GameEngine/Include/Common/ArchiveFileSystem.h GeneralsMD/Code/GameEngine/Include/Common/ArchiveFileSystem.h renamed to Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -54,12 +54,7 @@
 
 #include "Common/file.h"
 
-// srj sez: this was purely an experiment in optimization.
-// at the present time, it doesn't appear to be a good one.
-// but I am leaving the code in for now.
-// if still present in 2003, please nuke.
-#define NO_USE_BUFFERED_IO
-#ifdef USE_BUFFERED_IO
+#if USE_BUFFERED_IO
 #include <stdio.h>
 #endif
 
@@ -85,11 +80,12 @@ class LocalFile : public File
 	MEMORY_POOL_GLUE_ABC(LocalFile)		
 	private:
 
-#ifdef USE_BUFFERED_IO
+#if USE_BUFFERED_IO
+		// srj sez: this was purely an experiment in optimization.
+		// at the present time, it doesn't appear to be a good one.
+		// TheSuperHackers @info It is a good optimization and will be
+		// significantly faster than unbuffered IO with small reads and writes.
 		FILE* m_file;
-
-		enum { BUF_SIZE = 32768 };
-		char m_vbuf[BUF_SIZE];	
 #else
 		int m_handle;											///< Local C file handle
 #endif