diff options
| author | Matthew Hoops | 2011-08-09 16:26:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-09 16:26:25 -0400 |
| commit | acb0a36b6e9f2d2c07a8f96801a9041b15bbf9d7 (patch) | |
| tree | cd2902a84c83989c8a6f80d989626a0bc24e6c12 /backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp | |
| parent | b087acd793e8780fe13d72c202330098652f10a3 (diff) | |
| parent | 00d25a77a9d8297fdc356c7a10f9dc2d94903a5f (diff) | |
| download | scummvm-rg350-acb0a36b6e9f2d2c07a8f96801a9041b15bbf9d7.tar.gz scummvm-rg350-acb0a36b6e9f2d2c07a8f96801a9041b15bbf9d7.tar.bz2 scummvm-rg350-acb0a36b6e9f2d2c07a8f96801a9041b15bbf9d7.zip | |
Merge remote branch 'upstream/master' into soccer
Diffstat (limited to 'backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp')
| -rw-r--r-- | backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp index 2fd22c4e80..17a95688f3 100644 --- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp +++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp @@ -122,7 +122,7 @@ void DINGUXSdlGraphicsManager::initSize(uint w, uint h) { if (w > 320 || h > 240) { setGraphicsMode(GFX_HALF); setGraphicsModeIntern(); - _sdlEventSource->toggleMouseGrab(); + _eventSource->toggleMouseGrab(); } _transactionDetails.sizeChanged = true; @@ -427,6 +427,7 @@ void DINGUXSdlGraphicsManager::hideOverlay() { } bool DINGUXSdlGraphicsManager::loadGFXMode() { + debug("Game ScreenMode = %d*%d", _videoMode.screenWidth, _videoMode.screenHeight); // Forcefully disable aspect ratio correction for games // which starts with a native 240px height resolution. @@ -435,7 +436,6 @@ bool DINGUXSdlGraphicsManager::loadGFXMode() { _videoMode.aspectRatioCorrection = false; } - debug("Game ScreenMode = %d*%d", _videoMode.screenWidth, _videoMode.screenHeight); if (_videoMode.screenWidth > 320 || _videoMode.screenHeight > 240) { _videoMode.aspectRatioCorrection = false; setGraphicsMode(GFX_HALF); @@ -473,9 +473,13 @@ bool DINGUXSdlGraphicsManager::hasFeature(OSystem::Feature f) { void DINGUXSdlGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) { switch (f) { - case OSystem::kFeatureAspectRatioCorrection: + case OSystem::kFeatureAspectRatioCorrection: setAspectRatioCorrection(enable); break; + case OSystem::kFeatureCursorPalette: + _cursorPaletteDisabled = !enable; + blitCursor(); + break; default: break; } @@ -485,8 +489,10 @@ bool DINGUXSdlGraphicsManager::getFeatureState(OSystem::Feature f) { assert(_transactionMode == kTransactionNone); switch (f) { - case OSystem::kFeatureAspectRatioCorrection: - return _videoMode.aspectRatioCorrection; + case OSystem::kFeatureAspectRatioCorrection: + return _videoMode.aspectRatioCorrection; + case OSystem::kFeatureCursorPalette: + return !_cursorPaletteDisabled; default: return false; } @@ -516,7 +522,6 @@ void DINGUXSdlGraphicsManager::transformMouseCoordinates(Common::Point &point) { point.x *= 2; point.y *= 2; } - g_system->getEventManager()->pushEvent(newEvent); point.x /= _videoMode.scaleFactor; point.y /= _videoMode.scaleFactor; if (_videoMode.aspectRatioCorrection) |