Merge branch 'TheSuperHackers:main' into end_return_refactor

Author: vitimiti

.github/workflows/weekly-release.yml

@@ -90,7 +90,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          - preset: "vc6-weekly"
             tools: true
             extras: false
             release: true
@@ -110,7 +110,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - preset: "vc6"
+          - preset: "vc6-weekly"
             tools: true
             extras: false
             release: true
@@ -156,7 +156,7 @@ jobs:
       - name: Download Generals VC6 Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: Generals-vc6+t
+          name: Generals-vc6-weekly+t
           path: generals-vc6-artifacts
 
       - name: Prepare and Zip Generals VC6
@@ -167,7 +167,7 @@ jobs:
       - name: Download GeneralsMD VC6 Artifacts
         uses: actions/download-artifact@v4
         with:
-          name: GeneralsMD-vc6+t
+          name: GeneralsMD-vc6-weekly+t
           path: generalsmd-vc6-artifacts
 
       - name: Prepare and Zip GeneralsMD VC6

CMakePresets.json

@@ -53,6 +53,14 @@
                 "RTS_DEBUG_CRASHING": "ON"
             }
         },
+        {
+            "name": "vc6-weekly",
+            "displayName": "Windows 32bit VC6 Weekly Release",
+            "inherits": "vc6",
+            "cacheVariables": {
+                "RTS_BUILD_OPTION_VC6_FULL_DEBUG": "ON"
+            }
+        },
         {
             "name": "default",
             "displayName": "Default Config (don't use directly!)",
@@ -178,6 +186,12 @@
             "displayName": "Build Windows 32bit VC6 Release Logging",
             "description": "Build Windows 32bit VC6 Release Logging"
         },
+        {
+            "name": "vc6-weekly",
+            "configurePreset": "vc6-weekly",
+            "displayName": "Build Windows 32bit VC6 Weekly Release",
+            "description": "Build Windows 32bit VC6 Weekly Release"
+        },
         {
             "name": "win32",
             "configurePreset": "win32",
@@ -281,6 +295,19 @@
                 }
             ]
         },
+        {
+            "name": "vc6-weekly",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "vc6-weekly"
+                },
+                {
+                    "type": "build",
+                    "name": "vc6-weekly"
+                }
+            ]
+        },
         {
             "name": "win32",
             "steps": [

Core/GameEngine/Include/Common/FramePacer.h

@@ -49,6 +49,7 @@ class FramePacer
 
 	Real getUpdateTime() const; ///< Get the last update delta time in seconds.
 	Real getUpdateFps() const; ///< Get the last update fps.
+	Real getBaseOverUpdateFpsRatio(Real minUpdateFps = 5.0f); ///< Get the last engine base over update fps ratio. Used to scale user inputs to a frame rate independent speed.
 
 	void setTimeFrozen(Bool frozen); ///< Set time frozen. Allows scripted camera movement.
 	void setGameHalted(Bool halted); ///< Set game halted. Does not allow scripted camera movement.

Core/GameEngine/Source/Common/FramePacer.cpp

@@ -118,6 +118,13 @@ Real FramePacer::getUpdateFps()  const
 	return 1.0f / m_updateTime;
 }
 
+Real FramePacer::getBaseOverUpdateFpsRatio(Real minUpdateFps)
+{
+	// Update fps is floored to default 5 fps, 200 ms.
+	// Useful to prevent insane ratios on frame spikes/stalls.
+	return (Real)BaseFps / std::max(getUpdateFps(), minUpdateFps);
+}
+
 void FramePacer::setTimeFrozen(Bool frozen)
 {
 	m_isTimeFrozen = frozen;

Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp

@@ -500,8 +500,8 @@ const char * RingRenderObjClass::Get_Name(void) const
 void RingRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	const size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 /***********************************************************************************************

Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp

@@ -435,8 +435,8 @@ const char * SphereRenderObjClass::Get_Name(void) const
 void SphereRenderObjClass::Set_Name(const char * name)
 {
 	WWASSERT(name != NULL);
-	WWASSERT(strlen(name) < 2*W3D_NAME_LEN);
-	strcpy(Name,name);
+	const size_t nameLen = strlcpy(Name, name, ARRAY_SIZE(Name));
+	(void)nameLen; WWASSERT(nameLen < ARRAY_SIZE(Name));
 }
 
 

Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp

@@ -83,7 +83,7 @@ static void Scan_Emitter (ChunkLoadClass &cload, StringList &files, const char *
 static void Scan_Aggregate (ChunkLoadClass &cload, StringList &files, const char *w3d_name);
 static void Scan_HLOD (ChunkLoadClass &cload, StringList &files, const char *w3d_name);
 
-static void Get_W3D_Name (const char *filename, char *w3d_name);
+static void Get_W3D_Name (const char *filename, char *w3d_name, size_t w3d_name_size);
 static const char * Make_W3D_Filename (const char *w3d_name);
 
 
@@ -118,7 +118,7 @@ bool Get_W3D_Dependencies (const char *w3d_filename, StringList &files)
 
 	// Get the W3D name from the filename.
 	char w3d_name[W3D_NAME_LEN];
-	Get_W3D_Name(w3d_filename, w3d_name);
+	Get_W3D_Name(w3d_filename, w3d_name, ARRAY_SIZE(w3d_name));
 
 	// Create a chunk loader for this file, and scan the file.
 	ChunkLoadClass cload(file);
@@ -511,7 +511,7 @@ static void Scan_HLOD (ChunkLoadClass &cload, StringList &files, const char *w3d
  * HISTORY:                                                                                    *
  *   4/3/00     AJA : Created.                                                                 *
  *=============================================================================================*/
-static void Get_W3D_Name (const char *filename, char *w3d_name)
+static void Get_W3D_Name(const char* filename, char* w3d_name, size_t w3d_name_size)
 {
 	assert(filename);
 	assert(w3d_name);
@@ -532,9 +532,9 @@ static void Get_W3D_Name (const char *filename, char *w3d_name)
 
 	// Copy all characters from start to end (excluding 'end')
 	// into the w3d_name buffer. Then capitalize the string.
-	int num_chars = end - start;
-	WWASSERT(num_chars <= W3D_NAME_LEN);
-	strlcpy(w3d_name, start, min(W3D_NAME_LEN, num_chars));
+	size_t num_chars = end - start;
+	WWASSERT(num_chars < w3d_name_size);
+	strlcpy(w3d_name, start, min(w3d_name_size, num_chars));
 	strupr(w3d_name);
 }
 
@@ -554,7 +554,6 @@ static void Get_W3D_Name (const char *filename, char *w3d_name)
 static const char * Make_W3D_Filename (const char *w3d_name)
 {
 	assert(w3d_name);
-	assert(strlen(w3d_name) < W3D_NAME_LEN);
 
 	// Copy the w3d name into a static buffer, turn it into lowercase
 	// letters, and append a ".w3d" file extension. That's the filename.
@@ -565,7 +564,8 @@ static const char * Make_W3D_Filename (const char *w3d_name)
 		buffer[0] = 0;
 		return buffer;
 	}
-	strcpy(buffer, w3d_name);
+	const size_t bufferLen = strlcpy(buffer, w3d_name, ARRAY_SIZE(buffer));
+	(void)bufferLen; WWASSERT(bufferLen < W3D_NAME_LEN);
 	char *dot = strchr(buffer, '.');
 	if (dot)
 		*dot = 0;

Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.cpp

@@ -22,7 +22,7 @@
 
 
 DbgHelpGuard::DbgHelpGuard()
-	: m_hasLoaded(false)
+	: m_needsUnload(false)
 {
 	activate();
 }
@@ -34,26 +34,16 @@ DbgHelpGuard::~DbgHelpGuard()
 
 void DbgHelpGuard::activate()
 {
-	if (DbgHelpLoader::isLoadedFromSystem())
-	{
-		// This is ok. Do nothing.
-	}
-	else if (DbgHelpLoader::isLoaded())
-	{
-		// This is maybe not ok. But do nothing until this becomes a user facing problem.
-	}
-	else
-	{
-		// Front load the DLL now to prevent other code from loading the potentially wrong DLL.
-		m_hasLoaded = DbgHelpLoader::load();
-	}
+	// Front load the DLL now to prevent other code from loading the potentially wrong DLL.
+	DbgHelpLoader::load();
+	m_needsUnload = true;
 }
 
 void DbgHelpGuard::deactivate()
 {
-	if (m_hasLoaded)
+	if (m_needsUnload)
 	{
 		DbgHelpLoader::unload();
-		m_hasLoaded = false;
+		m_needsUnload = false;
 	}
 }

Core/Libraries/Source/WWVegas/WWLib/DbgHelpGuard.h

@@ -40,5 +40,5 @@ class DbgHelpGuard
 
 private:
 
-	bool m_hasLoaded;
+	bool m_needsUnload;
 };