[Scummvm-git-logs] scummvm master -> 81462fd56f4d82b30e0c836a02007bb37873313e

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
81462fd56f Revert "GRAPHICS: Add a mechanism to get the game and overlay display rects"


Commit: 81462fd56f4d82b30e0c836a02007bb37873313e
    https://github.com/scummvm/scummvm/commit/81462fd56f4d82b30e0c836a02007bb37873313e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-19T00:53:17+02:00

Commit Message:
Revert "GRAPHICS: Add a mechanism to get the game and overlay display rects"

This reverts commit 60b43e4f5294a4aa38ce378b17ce14d020d4cc2d.

The commit is incomplete: the relevant methods have to be exposed via the
base OSystem class.

Changed paths:
    backends/graphics/graphics.h
    backends/graphics/null/null-graphics.h
    backends/graphics/windowed.h


diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h
index 2bf9f0caac7..761be9bdbe6 100644
--- a/backends/graphics/graphics.h
+++ b/backends/graphics/graphics.h
@@ -75,7 +75,6 @@ public:
 
 	virtual int16 getHeight() const = 0;
 	virtual int16 getWidth() const = 0;
-	virtual Common::Rect getScreenRect() const = 0;
 	virtual void setPalette(const byte *colors, uint start, uint num) = 0;
 	virtual void grabPalette(byte *colors, uint start, uint num) const = 0;
 	virtual void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) = 0;
@@ -96,7 +95,6 @@ public:
 	virtual void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) = 0;
 	virtual int16 getOverlayHeight() const = 0;
 	virtual int16 getOverlayWidth() const = 0;
-	virtual Common::Rect getOverlayRect() const = 0;
 	virtual float getHiDPIScreenFactor() const { return 1.0f; }
 
 	virtual bool showMouse(bool visible) = 0;
diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h
index 9675a145fa6..1fcdeec066a 100644
--- a/backends/graphics/null/null-graphics.h
+++ b/backends/graphics/null/null-graphics.h
@@ -60,7 +60,6 @@ public:
 
 	int16 getHeight() const override { return _height; }
 	int16 getWidth() const override { return _width; }
-	Common::Rect getScreenRect() const override { return Common::Rect(0, 0, _width, _height); }
 	void setPalette(const byte *colors, uint start, uint num) override {}
 	void grabPalette(byte *colors, uint start, uint num) const override {}
 	void copyRectToScreen(const void *buf, int pitch, int x, int y, int w, int h) override {}
@@ -81,7 +80,6 @@ public:
 	void copyRectToOverlay(const void *buf, int pitch, int x, int y, int w, int h) override {}
 	int16 getOverlayHeight() const override { return _height; }
 	int16 getOverlayWidth() const override { return _width; }
-	Common::Rect getOverlayRect() const override { return Common::Rect(0, 0, _width, _height); }
 
 	bool showMouse(bool visible) override { return !visible; }
 	void warpMouse(int x, int y) override {}
diff --git a/backends/graphics/windowed.h b/backends/graphics/windowed.h
index 1324a8468d0..fc70bd7300c 100644
--- a/backends/graphics/windowed.h
+++ b/backends/graphics/windowed.h
@@ -53,14 +53,6 @@ public:
 		_cursorNeedsRedraw(false),
 		_cursorLastInActiveArea(true) {}
 
-	Common::Rect getScreenRect() const override {
-		return _gameDrawRect;
-	}
-
-	Common::Rect getOverlayRect() const override {
-		return _overlayDrawRect;
-	}
-
 	void showOverlay() override {
 		if (_overlayVisible)
 			return;