diff options
| author | Kamil Zbróg | 2013-10-28 17:07:28 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-10-28 17:07:28 +0000 |
| commit | 6734377e1bbb00403e11ef2194e890d8529e791b (patch) | |
| tree | d2889578042cd056b9780f2b0b8be84dd106cf43 /backends/platform/sdl/sdl.h | |
| parent | 39265b7a4b3e39348165b126ae53c9d89ccf32a9 (diff) | |
| parent | 5653a89e81d600b2388831cfe05c36d3068813b5 (diff) | |
| download | scummvm-rg350-6734377e1bbb00403e11ef2194e890d8529e791b.tar.gz scummvm-rg350-6734377e1bbb00403e11ef2194e890d8529e791b.tar.bz2 scummvm-rg350-6734377e1bbb00403e11ef2194e890d8529e791b.zip | |
Merge branch 'master' into prince
Diffstat (limited to 'backends/platform/sdl/sdl.h')
| -rw-r--r-- | backends/platform/sdl/sdl.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 590354b699..814cdd7c1b 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -30,6 +30,8 @@ #include "backends/events/sdl/sdl-events.h" #include "backends/log/log.h" +#include "common/array.h" + /** * Base OSystem class for all SDL ports. */ @@ -108,15 +110,18 @@ protected: #ifdef USE_OPENGL int _desktopWidth, _desktopHeight; - OSystem::GraphicsMode *_graphicsModes; + typedef Common::Array<GraphicsMode> GraphicsModeArray; + GraphicsModeArray _graphicsModes; + Common::Array<int> _graphicsModeIds; int _graphicsMode; - int _sdlModesCount; - int _glModesCount; + int _firstGLMode; + int _defaultSDLMode; + int _defaultGLMode; /** * Creates the merged graphics modes list */ - virtual void setupGraphicsModes(); + void setupGraphicsModes(); virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const; virtual int getDefaultGraphicsMode() const; |