aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2012-02-19 18:41:49 +0000
committerThierry Crozat2012-02-19 18:41:49 +0000
commit7a3df4681b3b399f58585b204b66b582ee17c163 (patch)
treeb51faf1a6b56bc641c0a54c9e6b0dcc7d512dcb1
parentf6b8fec0f13c739bf48c5b0c01647245fdeaa962 (diff)
downloadscummvm-rg350-7a3df4681b3b399f58585b204b66b582ee17c163.tar.gz
scummvm-rg350-7a3df4681b3b399f58585b204b66b582ee17c163.tar.bz2
scummvm-rg350-7a3df4681b3b399f58585b204b66b582ee17c163.zip
NULL: Fix compiler errors when using the NullGraphicsManager
The errors fixed are inaccessible base class when trying to set the _graphicsManager and a pure virtual function when trying to create the NullGraphicsManager instance.
-rw-r--r--backends/graphics/null/null-graphics.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h
index 28b24f6aca..2e6b24d147 100644
--- a/backends/graphics/null/null-graphics.h
+++ b/backends/graphics/null/null-graphics.h
@@ -27,7 +27,7 @@
static const OSystem::GraphicsMode s_noGraphicsModes[] = { {0, 0, 0} };
-class NullGraphicsManager : GraphicsManager {
+class NullGraphicsManager : public GraphicsManager {
public:
virtual ~NullGraphicsManager() {}
@@ -38,6 +38,7 @@ public:
const OSystem::GraphicsMode *getSupportedGraphicsModes() const { return s_noGraphicsModes; }
int getDefaultGraphicsMode() const { return 0; }
bool setGraphicsMode(int mode) { return true; }
+ void resetGraphicsScale(){}
int getGraphicsMode() const { return 0; }
inline Graphics::PixelFormat getScreenFormat() const {
return Graphics::PixelFormat::createFormatCLUT8();