win32: use GlobalMemoryStatusEx() on modern platforms for Sys_LowPhys…

…icalMemory()
ec- · Nov 11, 2024 · 3a5601b · 3a5601b
1 parent a3b19a3
commit 3a5601b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c
@@ -454,8 +454,8 @@ static void RB_Hyperspace( void ) {
 
 	RB_SetGL2D();
 
-	if (r_teleporterFlash->integer == 0) {
-		c.rgba[0] = c.rgba[1] = c.rgba[2] = (backEnd.refdef.time &   0); // fade to black
+	if ( r_teleporterFlash->integer == 0 ) {
+		c.rgba[0] = c.rgba[1] = c.rgba[2] = 0; // fade to black
 	} else {
 		c.rgba[0] = c.rgba[1] = c.rgba[2] = (backEnd.refdef.time & 255); // fade to white
 	}

diff --git a/code/renderer2/tr_backend.c b/code/renderer2/tr_backend.c
@@ -295,8 +295,8 @@ static void RB_Hyperspace( void ) {
 		// do initialization shit
 	}
 
-	if (r_teleporterFlash->integer == 0) {
-		c = ( backEnd.refdef.time &   0 ) / 255.0f; // fade to black
+	if ( r_teleporterFlash->integer == 0 ) {
+		c = 0.0; // fade to black
 	} else {
 		c = ( backEnd.refdef.time & 255 ) / 255.0f; // fade to white
 	}

diff --git a/code/renderervk/tr_backend.c b/code/renderervk/tr_backend.c
@@ -464,8 +464,8 @@ static void RB_Hyperspace( void ) {
 
 	RB_SetGL2D();
 
-	if (r_teleporterFlash->integer == 0) {
-		c.rgba[0] = c.rgba[1] = c.rgba[2] = (backEnd.refdef.time &   0); // fade to black
+	if ( r_teleporterFlash->integer == 0 ) {
+		c.rgba[0] = c.rgba[1] = c.rgba[2] = 0; // fade to black
 	} else {
 		c.rgba[0] = c.rgba[1] = c.rgba[2] = (backEnd.refdef.time & 255); // fade to white
 	}

diff --git a/code/win32/win_main.c b/code/win32/win_main.c
@@ -45,9 +45,20 @@ Sys_LowPhysicalMemory
 ==================
 */
 qboolean Sys_LowPhysicalMemory( void ) {
+#if	_MSC_VER < 1600 // MSVC 2008 and lower, assume win9x compatibility builds
 	MEMORYSTATUS stat;
 	GlobalMemoryStatus( &stat );
 	return (stat.dwTotalPhys <= MEM_THRESHOLD) ? qtrue : qfalse;
+#else
+	MEMORYSTATUSEX stat;
+	stat.dwLength = sizeof(stat);
+
+	if ( !GlobalMemoryStatusEx( &stat ) ) {
+		return qfalse;
+	}
+
+	return (stat.ullAvailPhys <= MEM_THRESHOLD) ? qtrue : qfalse;
+#endif
 }