diff options
| author | Max Horn | 2010-11-28 18:09:43 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-28 18:09:43 +0000 |
| commit | 1c3ba8bc405b1f249a488480e397a984834744d4 (patch) | |
| tree | fcf5402f69dbe804de5312dd6fe2899ee1a0f0e1 /backends/graphics | |
| parent | beed05b0affcab40d4b54576bd264c8be799c2b6 (diff) | |
| download | scummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.tar.gz scummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.tar.bz2 scummvm-rg350-1c3ba8bc405b1f249a488480e397a984834744d4.zip | |
LINUXMOTO: More compilation fixes
svn-id: r54540
Diffstat (limited to 'backends/graphics')
| -rw-r--r-- | backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp | 8 | ||||
| -rw-r--r-- | backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp index be4dbe74c3..bf3330db4c 100644 --- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp +++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp @@ -23,7 +23,7 @@ * */ -#ifdef LINUXMOTO +#if defined(LINUXMOTO) #include "backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h" #include "backends/events/linuxmotosdl/linuxmotosdl-events.h" @@ -134,7 +134,7 @@ void LinuxmotoSdlGraphicsManager::initSize(uint w, uint h) { if (w > 320 || h > 240) { setGraphicsMode(GFX_HALF); setGraphicsModeIntern(); - ((LinuxmotoSdlEventManager *)g_system->getEventManager())->toggleMouseGrab(); + _sdlEventSource->toggleMouseGrab(); } _transactionDetails.sizeChanged = true; @@ -484,8 +484,8 @@ void LinuxmotoSdlGraphicsManager::adjustMouseEvent(const Common::Event &event) { newEvent.synthetic = true; if (!_overlayVisible) { if (_videoMode.mode == GFX_HALF) { - event.mouse.x *= 2; - event.mouse.y *= 2; + newEvent.mouse.x *= 2; + newEvent.mouse.y *= 2; } newEvent.mouse.x /= _videoMode.scaleFactor; newEvent.mouse.y /= _videoMode.scaleFactor; diff --git a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h index 8124aca778..2a928ed7e1 100644 --- a/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h +++ b/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h @@ -26,6 +26,9 @@ #ifndef BACKENDS_GRAPHICS_SDL_LINUXMOTO_H #define BACKENDS_GRAPHICS_SDL_LINUXMOTO_H +// Disable symbol overrides so that we can use system headers. +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE + #include "backends/graphics/sdl/sdl-graphics.h" class LinuxmotoSdlGraphicsManager : public SdlGraphicsManager { |