Add JPEGQuality option to Options.ini (default 80)

bobtista · bobtista · commit 96699668aab1 · 2025-11-11T16:25:46.000-05:00
Move W3DScreenshot implementation to game-specific directories

Fix include order for VC6 precompiled headers

Remove default parameter from function definition

Move STB implementation to separate file to avoid PCH issues

Include screenshot implementation directly in W3DDisplay.cpp to avoid PCH issues

Use Windows constants and switch statement in screenshot code

Use vcpkg for stb dependency with FetchContent fallback
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
@@ -174,7 +174,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/W3DTerrainVisual.cpp
 #    Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
     Source/W3DDevice/GameClient/W3DVideoBuffer.cpp
-    Source/W3DDevice/GameClient/W3DScreenshot.cpp
 #    Source/W3DDevice/GameClient/W3DView.cpp
 #    Source/W3DDevice/GameClient/W3dWaypointBuffer.cpp
 #    Source/W3DDevice/GameClient/W3DWebBrowser.cpp
diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DScreenshot.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DScreenshot.h
@@ -18,11 +18,7 @@
 
 #pragma once
 
-enum ScreenshotFormat
-{
-	SCREENSHOT_JPEG,
-	SCREENSHOT_PNG
-};
+#include "GameClient/Display.h"
 
 void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality = 80);
 
diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h
@@ -139,6 +139,7 @@ class GlobalData : public SubsystemInterface
 	Int m_terrainLODTargetTimeMS;
 	Bool m_useAlternateMouse;
 	Bool m_rightMouseAlwaysScrolls;
+	Int m_jpegQuality;
 	Bool m_useWaterPlane;
 	Bool m_useCloudPlane;
 	Bool m_useShadowVolumes;
diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h
@@ -257,8 +257,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_BEGIN_PREFER_SELECTION,						///< The Shift key has been depressed alone
 		MSG_META_END_PREFER_SELECTION,							///< The Shift key has been released.
 
-		MSG_META_TAKE_SCREENSHOT,										///< take screenshot (JPEG)
-		MSG_META_TAKE_SCREENSHOT_PNG,								///< take PNG screenshot
+		MSG_META_TAKE_SCREENSHOT,										///< take JPEG screenshot (F12)
+		MSG_META_TAKE_SCREENSHOT_JPEG,							///< take PNG screenshot (CTRL+F12, lossless)
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
 
diff --git a/Generals/Code/GameEngine/Include/Common/UserPreferences.h b/Generals/Code/GameEngine/Include/Common/UserPreferences.h
@@ -91,6 +91,7 @@ class OptionPreferences : public UserPreferences
 	void setOnlineIPAddress(UnsignedInt IP);	// convenience function
 	Bool getArchiveReplaysEnabled() const;		// convenience function
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
+	Int getJPEGQuality(void);									// convenience function
 	Real getScrollFactor(void);								// convenience function
 	Bool getDrawScrollAnchor(void);
 	Bool getMoveScrollAnchor(void);
diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h
@@ -35,6 +35,12 @@
 
 class View;
 
+enum ScreenshotFormat
+{
+	SCREENSHOT_JPEG,
+	SCREENSHOT_PNG
+};
+
 struct ShroudLevel
 {
 	Short m_currentShroud;		///< A Value of 1 means shrouded.  0 is not.  Negative is the count of people looking.
@@ -168,8 +174,7 @@ class Display : public SubsystemInterface
 	virtual void preloadModelAssets( AsciiString model ) = 0;	///< preload model asset
 	virtual void preloadTextureAssets( AsciiString texture ) = 0;	///< preload texture asset
 
-	virtual void takeScreenShotCompressed(void) = 0;					///< saves JPEG screenshot
-	virtual void takeScreenShotPNG(void) = 0;									///< saves PNG screenshot
+	virtual void takeScreenShot(ScreenshotFormat format) = 0;			///< saves screenshot in specified format
 	virtual void toggleMovieCapture(void) = 0;							///< starts saving frames to an avi or frame sequence
 	virtual void toggleLetterBox(void) = 0;										///< enabled letter-boxed display
 	virtual void enableLetterBox(Bool enable) = 0;						///< forces letter-boxed display on/off
diff --git a/Generals/Code/GameEngine/Source/Common/GlobalData.cpp b/Generals/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -1180,6 +1180,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	// override INI values with user preferences
 	OptionPreferences optionPref;
  	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
+	TheWritableGlobalData->m_jpegQuality = optionPref.getJPEGQuality();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
 	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
 	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();
diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
-	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
 	CASE_LABEL(MSG_META_ALL_CHEER)
 	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
 	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
@@ -335,6 +335,17 @@ Bool OptionPreferences::getAlternateMouseModeEnabled(void)
 	return FALSE;
 }
 
+Int OptionPreferences::getJPEGQuality(void)
+{
+	OptionPreferences::const_iterator it = find("JPEGQuality");
+	if (it == end())
+		return 80;
+
+	Int quality = atoi(it->second.str());
+	if (quality < 1) quality = 1;
+	if (quality > 100) quality = 100;
+	return quality;
+}
 
 Real OptionPreferences::getScrollFactor(void)
 {
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
@@ -3410,14 +3410,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage
 		case GameMessage::MSG_META_TAKE_SCREENSHOT:
 		{
 			if (TheDisplay)
-				TheDisplay->takeScreenShotCompressed();
+				TheDisplay->takeScreenShot(SCREENSHOT_JPEG);
 			break;
 		}
 
-		case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:
+		case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:
 		{
 			if (TheDisplay)
-				TheDisplay->takeScreenShotPNG();
+				TheDisplay->takeScreenShot(SCREENSHOT_PNG);
 			disp = DESTROY_MESSAGE;
 			break;
 		}
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
@@ -163,7 +163,7 @@ static const LookupListRec GameMessageMetaTypeNames[] =
 	{ "END_PREFER_SELECTION",											GameMessage::MSG_META_END_PREFER_SELECTION },
 
 	{ "TAKE_SCREENSHOT",													GameMessage::MSG_META_TAKE_SCREENSHOT },
-	{ "TAKE_SCREENSHOT_PNG",											GameMessage::MSG_META_TAKE_SCREENSHOT_PNG },
+	{ "TAKE_SCREENSHOT_JPEG",											GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG },
 	{ "ALL_CHEER",																GameMessage::MSG_META_ALL_CHEER },
 
 	{ "BEGIN_CAMERA_ROTATE_LEFT",									GameMessage::MSG_META_BEGIN_CAMERA_ROTATE_LEFT },
@@ -795,7 +795,17 @@ MetaMapRec *MetaMap::getMetaMapRec(GameMessage::Type t)
 		}
 	}
 	{
-		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_PNG);
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT);
+		if (map->m_key == MK_NONE)
+		{
+			map->m_key = MK_F12;
+			map->m_transition = DOWN;
+			map->m_modState = NONE;
+			map->m_usableIn = COMMANDUSABLE_EVERYWHERE;
+		}
+	}
+	{
+		MetaMapRec *map = TheMetaMap->getMetaMapRec(GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG);
 		if (map->m_key == MK_NONE)
 		{
 			map->m_key = MK_F12;
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -204,6 +204,16 @@ target_link_libraries(g_gameenginedevice PRIVATE
     stb
 )
 
+target_sources(g_gameenginedevice PRIVATE
+    Source/W3DDevice/GameClient/stb_image_write_impl.cpp
+)
+
+set_source_files_properties(
+    Source/W3DDevice/GameClient/stb_image_write_impl.cpp
+    PROPERTIES
+    SKIP_PRECOMPILE_HEADERS ON
+)
+
 target_link_libraries(g_gameenginedevice PUBLIC
     corei_gameenginedevice_public
     g_gameengine
diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
@@ -120,8 +120,7 @@ class W3DDisplay : public Display
 
 	virtual VideoBuffer*	createVideoBuffer( void ) ;							///< Create a video buffer that can be used for this display
 
-	virtual void takeScreenShotCompressed(void);	//save JPEG screenshot
-	virtual void takeScreenShotPNG(void);					//save PNG screenshot
+	virtual void takeScreenShot(ScreenshotFormat format);	//save screenshot in specified format
 	virtual void toggleMovieCapture(void);			//enable AVI or frame capture mode.
 
 	virtual void toggleLetterBox(void);	///<enabled letter-boxed display
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
@@ -2879,15 +2879,8 @@ static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
 	LocalFree( (HLOCAL) pbmi);
 }
 
-void W3DDisplay::takeScreenShotCompressed(void)
-{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG, 80);
-}
-
-void W3DDisplay::takeScreenShotPNG(void)
-{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG, 0);
-}
+///Save Screen Capture to a file
+#include "W3DScreenshot.cpp"
 
 /** Start/Stop capturing an AVI movie*/
 void W3DDisplay::toggleMovieCapture(void)
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp
@@ -1,42 +1,12 @@
-/*
-**	Command & Conquer Generals Zero Hour(tm)
-**	Copyright 2025 Electronic Arts Inc.
-**
-**	This program is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 3 of the License, or
-**	(at your option) any later version.
-**
-**	This program is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdlib.h>
-#include <windows.h>
-#include <io.h>
-
-#define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb_image_write.h>
 
-#include "W3DDevice/GameClient/W3DScreenshot.h"
-#include "Common/GlobalData.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/GameText.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/surface.h"
-
 struct ScreenshotThreadData
 {
 	unsigned char* imageData;
 	unsigned int width;
 	unsigned int height;
-	char pathname[1024];
-	char leafname[256];
+	char pathname[_MAX_PATH];
+	char leafname[_MAX_FNAME];
 	int quality;
 	ScreenshotFormat format;
 };
@@ -46,13 +16,14 @@ static DWORD WINAPI screenshotThreadFunc(LPVOID param)
 	ScreenshotThreadData* data = (ScreenshotThreadData*)param;
 	
 	int result = 0;
-	if (data->format == SCREENSHOT_JPEG)
-	{
-		result = stbi_write_jpg(data->pathname, data->width, data->height, 3, data->imageData, data->quality);
-	}
-	else if (data->format == SCREENSHOT_PNG)
+	switch (data->format)
 	{
-		result = stbi_write_png(data->pathname, data->width, data->height, 3, data->imageData, data->width * 3);
+		case SCREENSHOT_JPEG:
+			result = stbi_write_jpg(data->pathname, data->width, data->height, 3, data->imageData, data->quality);
+			break;
+		case SCREENSHOT_PNG:
+			result = stbi_write_png(data->pathname, data->width, data->height, 3, data->imageData, data->width * 3);
+			break;
 	}
 	
 	if (!result) {
@@ -67,8 +38,8 @@ static DWORD WINAPI screenshotThreadFunc(LPVOID param)
 
 void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 {
-	char leafname[256];
-	char pathname[1024];
+	char leafname[_MAX_FNAME];
+	char pathname[_MAX_PATH];
 	static int jpegFrameNumber = 1;
 	static int pngFrameNumber = 1;
 	
@@ -130,6 +101,9 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 	surfaceCopy->Release_Ref();
 	surfaceCopy = NULL;
 
+	if (quality <= 0 && format == SCREENSHOT_JPEG)
+		quality = TheGlobalData->m_jpegQuality;
+
 	ScreenshotThreadData* threadData = new ScreenshotThreadData();
 	threadData->imageData = image;
 	threadData->width = width;
@@ -150,3 +124,7 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 	TheInGameUI->message(TheGameText->fetch("GUI:ScreenCapture"), ufileName.str());
 }
 
+void W3DDisplay::takeScreenShot(ScreenshotFormat format)
+{
+	W3D_TakeCompressedScreenshot(format);
+}
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/stb_image_write_impl.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/stb_image_write_impl.cpp
@@ -0,0 +1,21 @@
+/*
+**	Command & Conquer Generals(tm)
+**	Copyright 2025 Electronic Arts Inc.
+**
+**	This program is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 3 of the License, or
+**	(at your option) any later version.
+**
+**	This program is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+#include <stb_image_write.h>
+
diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
@@ -101,8 +101,7 @@ class GUIEditDisplay : public Display
 	virtual void drawScaledVideoBuffer( VideoBuffer *buffer, VideoStreamInterface *stream ) { }
 	virtual void drawVideoBuffer( VideoBuffer *buffer, Int startX, Int startY,
 																Int endX, Int endY ) { }
-	virtual void takeScreenShotCompressed(void){ }
-	virtual void takeScreenShotPNG(void){ }
+	virtual void takeScreenShot(ScreenshotFormat){ }
 	virtual void toggleMovieCapture(void) {}
 
 	// methods that we need to stub
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h
@@ -143,6 +143,7 @@ class GlobalData : public SubsystemInterface
 	Bool m_clientRetaliationModeEnabled;
 	Bool m_doubleClickAttackMove;
 	Bool m_rightMouseAlwaysScrolls;
+	Int m_jpegQuality;
 	Bool m_useWaterPlane;
 	Bool m_useCloudPlane;
 	Bool m_useShadowVolumes;
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h
@@ -257,8 +257,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_META_BEGIN_PREFER_SELECTION,						///< The Shift key has been depressed alone
 		MSG_META_END_PREFER_SELECTION,							///< The Shift key has been released.
 
-		MSG_META_TAKE_SCREENSHOT,										///< take screenshot (JPEG)
-		MSG_META_TAKE_SCREENSHOT_PNG,								///< take PNG screenshot
+		MSG_META_TAKE_SCREENSHOT,										///< take JPEG screenshot (F12)
+		MSG_META_TAKE_SCREENSHOT_JPEG,							///< take PNG screenshot (CTRL+F12, lossless)
 		MSG_META_ALL_CHEER,													///< Yay! :)
 		MSG_META_TOGGLE_ATTACKMOVE,									///< enter attack-move mode
 
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h
@@ -93,6 +93,7 @@ class OptionPreferences : public UserPreferences
 	Bool getAlternateMouseModeEnabled(void);	// convenience function
 	Bool getRetaliationModeEnabled();					// convenience function
 	Bool getDoubleClickAttackMoveEnabled(void);	// convenience function
+	Int getJPEGQuality(void);									// convenience function
 	Real getScrollFactor(void);								// convenience function
 	Bool getDrawScrollAnchor(void);
 	Bool getMoveScrollAnchor(void);
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h
@@ -35,6 +35,12 @@
 
 class View;
 
+enum ScreenshotFormat
+{
+	SCREENSHOT_JPEG,
+	SCREENSHOT_PNG
+};
+
 struct ShroudLevel
 {
 	Short m_currentShroud;		///< A Value of 1 means shrouded.  0 is not.  Negative is the count of people looking.
@@ -168,8 +174,7 @@ class Display : public SubsystemInterface
 	virtual void preloadModelAssets( AsciiString model ) = 0;	///< preload model asset
 	virtual void preloadTextureAssets( AsciiString texture ) = 0;	///< preload texture asset
 
-	virtual void takeScreenShotCompressed(void) = 0;					///< saves JPEG screenshot
-	virtual void takeScreenShotPNG(void) = 0;									///< saves PNG screenshot
+	virtual void takeScreenShot(ScreenshotFormat format) = 0;			///< saves screenshot in specified format
 	virtual void toggleMovieCapture(void) = 0;							///< starts saving frames to an avi or frame sequence
 	virtual void toggleLetterBox(void) = 0;										///< enabled letter-boxed display
 	virtual void enableLetterBox(Bool enable) = 0;						///< forces letter-boxed display on/off
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp b/GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
@@ -1208,6 +1208,7 @@ void GlobalData::parseGameDataDefinition( INI* ini )
 	TheWritableGlobalData->m_useAlternateMouse = optionPref.getAlternateMouseModeEnabled();
 	TheWritableGlobalData->m_clientRetaliationModeEnabled = optionPref.getRetaliationModeEnabled();
 	TheWritableGlobalData->m_doubleClickAttackMove = optionPref.getDoubleClickAttackMoveEnabled();
+	TheWritableGlobalData->m_jpegQuality = optionPref.getJPEGQuality();
 	TheWritableGlobalData->m_keyboardScrollFactor = optionPref.getScrollFactor();
 	TheWritableGlobalData->m_drawScrollAnchor = optionPref.getDrawScrollAnchor();
 	TheWritableGlobalData->m_moveScrollAnchor = optionPref.getMoveScrollAnchor();
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -364,7 +364,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_BEGIN_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_END_PREFER_SELECTION)
 	CASE_LABEL(MSG_META_TAKE_SCREENSHOT)
-	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_PNG)
+	CASE_LABEL(MSG_META_TAKE_SCREENSHOT_JPEG)
 	CASE_LABEL(MSG_META_ALL_CHEER)
 	CASE_LABEL(MSG_META_TOGGLE_ATTACKMOVE)
 	CASE_LABEL(MSG_META_BEGIN_CAMERA_ROTATE_LEFT)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/OptionsMenu.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/CommandXlat.cpp
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/MetaEvent.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/stb_image_write_impl.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/stb_image_write_impl.cpp
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
diff --git a/cmake/stb.cmake b/cmake/stb.cmake
diff --git a/vcpkg.json b/vcpkg.json

Original file line number	Diff line number	Diff line change
`@@ -3410,14 +3410,14 @@ GameMessageDisposition CommandTranslator::translateGameMessage(const GameMessage`
`3410`	`3410`	`case GameMessage::MSG_META_TAKE_SCREENSHOT:`
`3411`	`3411`	`{`
`3412`	`3412`	`if (TheDisplay)`
`3413`		`- TheDisplay->takeScreenShotCompressed();`
	`3413`	`+ TheDisplay->takeScreenShot(SCREENSHOT_JPEG);`
`3414`	`3414`	`break;`
`3415`	`3415`	`}`
`3416`	`3416`
`3417`		`- case GameMessage::MSG_META_TAKE_SCREENSHOT_PNG:`
	`3417`	`+ case GameMessage::MSG_META_TAKE_SCREENSHOT_JPEG:`
`3418`	`3418`	`{`
`3419`	`3419`	`if (TheDisplay)`
`3420`		`- TheDisplay->takeScreenShotPNG();`
	`3420`	`+ TheDisplay->takeScreenShot(SCREENSHOT_PNG);`
`3421`	`3421`	`disp = DESTROY_MESSAGE;`
`3422`	`3422`	`break;`
`3423`	`3423`	`}`