diff options
| author | Eugene Sandulenko | 2017-03-05 00:56:02 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-03-05 00:56:27 +0100 |
| commit | 8b8fd13d566aff2c212a6114e7ac472c3b19f9af (patch) | |
| tree | b3030df387d0237541ffdb358e7c92ee6a6febc6 /backends | |
| parent | 6ce06d2ed0ee59fe2705e7738032112f7e5a4969 (diff) | |
| download | scummvm-rg350-8b8fd13d566aff2c212a6114e7ac472c3b19f9af.tar.gz scummvm-rg350-8b8fd13d566aff2c212a6114e7ac472c3b19f9af.tar.bz2 scummvm-rg350-8b8fd13d566aff2c212a6114e7ac472c3b19f9af.zip | |
BACKENDS: Fix const'ness which led to warnings
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/graphics/graphics.h | 8 | ||||
| -rw-r--r-- | backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 2 | ||||
| -rw-r--r-- | backends/graphics/surfacesdl/surfacesdl-graphics.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h index f6b0058fac..35f2fa1cb6 100644 --- a/backends/graphics/graphics.h +++ b/backends/graphics/graphics.h @@ -46,13 +46,13 @@ public: virtual bool setGraphicsMode(int mode) = 0; virtual void resetGraphicsScale() = 0; virtual int getGraphicsMode() const = 0; - virtual const OSystem::GraphicsMode *getSupportedShaders() const { - static const OSystem::GraphicsMode no_shader[2] = {{"NONE", "Normal (no shader)", 0}, {0, 0, 0}}; + virtual const OSystem::GraphicsMode *getSupportedShaders() const { + static const OSystem::GraphicsMode no_shader[2] = {{"NONE", "Normal (no shader)", 0}, {0, 0, 0}}; return no_shader; }; virtual bool setShader(int id) { return false; } - virtual int getShader() { return 0; } - + virtual int getShader() const { return 0; } + #ifdef USE_RGB_COLOR virtual Graphics::PixelFormat getScreenFormat() const = 0; virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const = 0; diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp index 2b31e90352..692602bf07 100644 --- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp +++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp @@ -706,7 +706,7 @@ const OSystem::GraphicsMode *SurfaceSdlGraphicsManager::getSupportedShaders() co return s_supportedShaders; } -int SurfaceSdlGraphicsManager::getShader() { +int SurfaceSdlGraphicsManager::getShader() const { return _currentShader; } diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.h b/backends/graphics/surfacesdl/surfacesdl-graphics.h index ef41b90f6c..fa130cd9a5 100644 --- a/backends/graphics/surfacesdl/surfacesdl-graphics.h +++ b/backends/graphics/surfacesdl/surfacesdl-graphics.h @@ -106,7 +106,7 @@ public: virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const; #endif virtual const OSystem::GraphicsMode *getSupportedShaders() const; - virtual int getShader(); + virtual int getShader() const; virtual bool setShader(int id); virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL); virtual int getScreenChangeID() const { return _screenChangeCount; } |