diff options
| author | Alejandro Marzini | 2010-06-08 23:44:05 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-08 23:44:05 +0000 |
| commit | 4fe0b4e1ad9d44f65cc6c144f1998cbc17913797 (patch) | |
| tree | f28ed7d8d72fb11957e2b8809128d164b43d879e /backends/graphics/sdl | |
| parent | 7ea78b10364d34ae607a9a1da00e4d42ad691aa1 (diff) | |
| download | scummvm-rg350-4fe0b4e1ad9d44f65cc6c144f1998cbc17913797.tar.gz scummvm-rg350-4fe0b4e1ad9d44f65cc6c144f1998cbc17913797.tar.bz2 scummvm-rg350-4fe0b4e1ad9d44f65cc6c144f1998cbc17913797.zip | |
Renamed and moved DefaultGraphicsManager to NullGraphicsManager. Added pure virtual class GraphicsManager.
svn-id: r49528
Diffstat (limited to 'backends/graphics/sdl')
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.cpp | 9 | ||||
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.h | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp index 5276cbbf30..8fc2ef6f08 100644 --- a/backends/graphics/sdl/sdl-graphics.cpp +++ b/backends/graphics/sdl/sdl-graphics.cpp @@ -1193,6 +1193,13 @@ void SdlGraphicsManager::unlockScreen() { g_system->unlockMutex(_graphicsMutex); } +void SdlGraphicsManager::fillScreen(uint32 col) { + Graphics::Surface *screen = lockScreen(); + if (screen && screen->pixels) + memset(screen->pixels, col, screen->h * screen->pitch); + unlockScreen(); +} + void SdlGraphicsManager::addDirtyRect(int x, int y, int w, int h, bool realCoordinates) { if (_forceFull) return; @@ -1966,7 +1973,7 @@ bool SdlGraphicsManager::handleScalerHotkeys(const SDL_KeyboardEvent &key) { // Ctrl-Alt-a toggles aspect ratio correction if (key.keysym.sym == 'a') { beginGFXTransaction(); - setGraphicsFeatureState(OSystem::kFeatureAspectRatioCorrection, !_videoMode.aspectRatioCorrection); + setFeatureState(OSystem::kFeatureAspectRatioCorrection, !_videoMode.aspectRatioCorrection); endGFXTransaction(); #ifdef USE_OSD char buffer[128]; diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 13ce5af5dc..650b01794b 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -26,7 +26,7 @@ #ifndef BACKENDS_GRAPHICS_SDL_H #define BACKENDS_GRAPHICS_SDL_H -#include "backends/graphics/default/default-graphics.h" +#include "backends/graphics/abstract-graphics.h" #include "common/system.h" #include "graphics/scaler.h" @@ -68,7 +68,7 @@ public: int kh() const { return _kh; } }; -class SdlGraphicsManager : public DefaultGraphicsManager { +class SdlGraphicsManager : public GraphicsManager { public: SdlGraphicsManager(); ~SdlGraphicsManager(); @@ -306,5 +306,4 @@ protected: int effectiveScreenHeight() const; }; - #endif |