diff options
| author | Paul Gilbert | 2016-05-26 23:01:34 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-05-26 23:01:34 -0400 |
| commit | 559b9744bfc6e7c84f75641bafc531f9ab30cdc8 (patch) | |
| tree | 45a88953d0477aeae4a8ac47b4a1ad935df40e3b /engines/tsage/screen.h | |
| parent | 4d933a15f65809afa330622339a200f15cb19eeb (diff) | |
| download | scummvm-rg350-559b9744bfc6e7c84f75641bafc531f9ab30cdc8.tar.gz scummvm-rg350-559b9744bfc6e7c84f75641bafc531f9ab30cdc8.tar.bz2 scummvm-rg350-559b9744bfc6e7c84f75641bafc531f9ab30cdc8.zip | |
TSAGE: Refactor GfxSurface and Screen to not use virtual inheritance
Diffstat (limited to 'engines/tsage/screen.h')
| -rw-r--r-- | engines/tsage/screen.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/tsage/screen.h b/engines/tsage/screen.h index bf5057e4d6..c5cfee754a 100644 --- a/engines/tsage/screen.h +++ b/engines/tsage/screen.h @@ -36,7 +36,14 @@ namespace TsAGE { #define SCREEN_CENTER_Y 100 #define UI_INTERFACE_Y 168 -class Screen : virtual public Graphics::Screen, virtual public GfxSurface { +class Screen : public GfxSurface { + /** + * Override the addDirtyRect from GfxSurface, since for our screen + * class we need to reintroduce the standard Graphics::Screen implementation + */ + virtual void addDirtyRect(const Common::Rect &r) { + Graphics::Screen::addDirtyRect(r); + } public: /** * Constructor @@ -46,7 +53,7 @@ public: /** * Destructor */ - virtual ~Screen() {} + virtual ~Screen(); /** * Update the screen |