remove more references to gScreenDPI

src/drawing/IDrawingEngine.h

@@ -31,8 +31,9 @@ interface IDrawingEngine
     virtual void Resize(uint32 width, uint32 height) abstract;
     virtual void SetPalette(SDL_Color * colours)     abstract;
 
-    virtual void Invalidate(sint32 left, sint32 top, sint32 right, sint32 bottom) abstract;
-    virtual void Draw() abstract;
+    virtual void    Invalidate(sint32 left, sint32 top, sint32 right, sint32 bottom) abstract;
+    virtual void    Draw() abstract;
+    virtual sint32  Screenshot() abstract;
 
     virtual IDrawingContext * GetDrawingContext(rct_drawpixelinfo * dpi) abstract;
 };

src/drawing/NewDrawing.cpp

@@ -122,4 +122,13 @@ extern "C"
             dc->DrawSpriteRawMasked(x, y, maskImage, colourImage);
         }
     }
+
+    int screenshot_dump()
+    {
+        if (_drawingEngine != nullptr)
+        {
+            return _drawingEngine->Screenshot();
+        }
+        return false;
+    }
 }

src/drawing/engines/OpenGLDrawingEngine.cpp

@@ -189,6 +189,12 @@ public:
         }
         Display();
     }
+    
+    sint32 Screenshot() override
+    {
+        // Not implemented
+        return -1;
+    }
 
     IDrawingContext * GetDrawingContext(rct_drawpixelinfo * dpi) override
     {

src/drawing/engines/SoftwareDrawingEngine.cpp

@@ -23,6 +23,7 @@
 extern "C"
 {
     #include "../../config.h"
+    #include "../../interface/screenshot.h"
     #include "../../interface/window.h"
     #include "../../intro.h"
     #include "../drawing.h"
@@ -315,6 +316,11 @@ public:
         Display();
     }
 
+    sint32 Screenshot() override
+    {
+        return screenshot_dump_png(&_bitsDPI);
+    }
+
     IDrawingContext * GetDrawingContext(rct_drawpixelinfo * dpi) override
     {
         _drawingContext->SetDPI(dpi);

src/interface/screenshot.c

@@ -29,8 +29,6 @@
 #include "screenshot.h"
 #include "viewport.h"
 
-static int screenshot_dump_png();
-
 /**
  *
  *  rct2: 0x006E3AEC
@@ -98,12 +96,7 @@ static int screenshot_get_next_path(char *path)
 	return -1;
 }
 
-int screenshot_dump()
-{
-	return screenshot_dump_png();
-}
-
-int screenshot_dump_png()
+int screenshot_dump_png(rct_drawpixelinfo *dpi)
 {
 	// Get a free screenshot path
 	int index;
@@ -112,8 +105,6 @@ int screenshot_dump_png()
 		return -1;
 	}
 
-	rct_drawpixelinfo *dpi = &gScreenDPI;
-
 	rct_palette renderedPalette;
 	screenshot_get_rendered_palette(&renderedPalette);
 

src/interface/screenshot.h

@@ -17,8 +17,11 @@
 #ifndef _SCREENSHOT_H_
 #define _SCREENSHOT_H_
 
+#include "../drawing/drawing.h"
+
 void screenshot_check();
 int screenshot_dump();
+int screenshot_dump_png(rct_drawpixelinfo *dpi);
 
 void screenshot_giant();
 int cmdline_for_screenshot(const char **argv, int argc);

src/rct2.c

@@ -186,8 +186,6 @@ int rct2_init()
 
 	if (!gOpenRCT2Headless) {
 		title_load();
-
-		gfx_clear(&gScreenDPI, 10);
 	}
 
 	log_verbose("initialising game finished");