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

Author: bobtista

Generals/Code/GameEngineDevice/CMakeLists.txt

@@ -140,7 +140,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
     Source/W3DDevice/GameClient/W3DDebugIcons.cpp
     Source/W3DDevice/GameClient/W3DDisplay.cpp
-    Source/W3DDevice/GameClient/W3DScreenshot.cpp
     Source/W3DDevice/GameClient/W3DDisplayString.cpp
     Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
     Source/W3DDevice/GameClient/W3DDynamicLight.cpp

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -2886,16 +2886,7 @@ static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
 }
 
 ///Save Screen Capture to a file
-
-void W3DDisplay::takeScreenShotCompressed(void)
-{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG);
-}
-
-void W3DDisplay::takeScreenShotPNG(void)
-{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG);
-}
+#include "W3DScreenshot.cpp"
 
 /** Start/Stop capturing an AVI movie*/
 void W3DDisplay::toggleMovieCapture(void)

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp

@@ -1,32 +1,3 @@
-/*
-**	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 "W3DDevice/GameClient/W3DScreenshot.h"
-
-#include <stdlib.h>
-#include <windows.h>
-#include <io.h>
-
-#include "Common/GlobalData.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/GameText.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/surface.h"
 #include <stb_image_write.h>
 
 struct ScreenshotThreadData
@@ -152,3 +123,12 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 	TheInGameUI->message(TheGameText->fetch("GUI:ScreenCapture"), ufileName.str());
 }
 
+void W3DDisplay::takeScreenShotCompressed(void)
+{
+	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG);
+}
+
+void W3DDisplay::takeScreenShotPNG(void)
+{
+	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG);
+}

GeneralsMD/Code/GameEngineDevice/CMakeLists.txt

@@ -151,7 +151,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/W3DDebugDisplay.cpp
     Source/W3DDevice/GameClient/W3DDebugIcons.cpp
     Source/W3DDevice/GameClient/W3DDisplay.cpp
-    Source/W3DDevice/GameClient/W3DScreenshot.cpp
     Source/W3DDevice/GameClient/W3DDisplayString.cpp
     Source/W3DDevice/GameClient/W3DDisplayStringManager.cpp
     Source/W3DDevice/GameClient/W3DDynamicLight.cpp

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DDisplay.cpp

@@ -3005,16 +3005,7 @@ static void CreateBMPFile(LPTSTR pszFile, char *image, Int width, Int height)
 }
 
 ///Save Screen Capture to a file
-
-void W3DDisplay::takeScreenShotCompressed(void)
-{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG);
-}
-
-void W3DDisplay::takeScreenShotPNG(void)
-		{
-	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG);
-}
+#include "W3DScreenshot.cpp"
 
 /** Start/Stop capturing an AVI movie*/
 void W3DDisplay::toggleMovieCapture(void)

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DScreenshot.cpp

@@ -1,32 +1,3 @@
-/*
-**	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 "W3DDevice/GameClient/W3DScreenshot.h"
-
-#include <stdlib.h>
-#include <windows.h>
-#include <io.h>
-
-#include "Common/GlobalData.h"
-#include "GameClient/InGameUI.h"
-#include "GameClient/GameText.h"
-#include "WW3D2/dx8wrapper.h"
-#include "WW3D2/surface.h"
 #include <stb_image_write.h>
 
 struct ScreenshotThreadData
@@ -152,3 +123,12 @@ void W3D_TakeCompressedScreenshot(ScreenshotFormat format, int quality)
 	TheInGameUI->message(TheGameText->fetch("GUI:ScreenCapture"), ufileName.str());
 }
 
+void W3DDisplay::takeScreenShotCompressed(void)
+{
+	W3D_TakeCompressedScreenshot(SCREENSHOT_JPEG);
+}
+
+void W3DDisplay::takeScreenShotPNG(void)
+{
+	W3D_TakeCompressedScreenshot(SCREENSHOT_PNG);
+}