[Scummvm-cvs-logs] SF.net SVN: scummvm:[54540] scummvm/trunk/backends

[fingolfin at users.sourceforge.net]

Revision: 54540
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54540&view=rev
Author:   fingolfin
Date:     2010-11-28 18:09:43 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
LINUXMOTO: More compilation fixes

Modified Paths:
--------------
    scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
    scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.h
    scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
    scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h

Modified: scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.cpp
===================================================================
--- scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.cpp	2010-11-28 17:43:10 UTC (rev 54539)
+++ scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.cpp	2010-11-28 18:09:43 UTC (rev 54540)
@@ -25,6 +25,9 @@
 
 #if defined(LINUXMOTO)
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+
 #include "backends/events/linuxmotosdl/linuxmotosdl-events.h"
 #include "backends/platform/linuxmoto/linuxmoto-sdl.h"
 
@@ -32,13 +35,7 @@
 	GFX_HALF = 12
 };
 
-LinuxmotoSdlEventManager::LinuxmotoSdlEventManager(Common::EventSource *boss)
-	:
-	SdlEventManager(boss) {
-
-}
-
-void LinuxmotoSdlEventManager::preprocessEvents(SDL_Event *event) {
+void LinuxmotoSdlEventSource::preprocessEvents(SDL_Event *event) {
 	if (event->type == SDL_ACTIVEEVENT) {
 		if (event->active.state == SDL_APPINPUTFOCUS && !event->active.gain) {
 			((OSystem_SDL* )g_system)->getMixerManager()->suspendAudio();
@@ -60,7 +57,7 @@
 	}
 }
 
-bool LinuxmotoSdlEventManager::remapKey(SDL_Event &ev, Common::Event &event) {
+bool LinuxmotoSdlEventSource::remapKey(SDL_Event &ev, Common::Event &event) {
 	if (false) {}
 
 	//  Motorol A1200/E6/A1600 remapkey by Lubomyr

Modified: scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.h
===================================================================
--- scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.h	2010-11-28 17:43:10 UTC (rev 54539)
+++ scummvm/trunk/backends/events/linuxmotosdl/linuxmotosdl-events.h	2010-11-28 18:09:43 UTC (rev 54540)
@@ -31,10 +31,7 @@
 /**
  * SDL events manager for LINUXMOTO
  */
-class LinuxmotoSdlEventManager : public SdlEventManager {
-public:
-	LinuxmotoSdlEventManager(Common::EventSource *boss);
-
+class LinuxmotoSdlEventSource : public SdlEventSource {
 protected:
 	virtual void preprocessEvents(SDL_Event *event);
 	virtual bool remapKey(SDL_Event &ev, Common::Event &event);

Modified: scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp	2010-11-28 17:43:10 UTC (rev 54539)
+++ scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.cpp	2010-11-28 18:09:43 UTC (rev 54540)
@@ -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 @@
 	if	(w > 320 || h > 240) {
 		setGraphicsMode(GFX_HALF);
 		setGraphicsModeIntern();
-		((LinuxmotoSdlEventManager *)g_system->getEventManager())->toggleMouseGrab();
+		_sdlEventSource->toggleMouseGrab();
 	}
 
 	_transactionDetails.sizeChanged = true;
@@ -484,8 +484,8 @@
 		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;

Modified: scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h	2010-11-28 17:43:10 UTC (rev 54539)
+++ scummvm/trunk/backends/graphics/linuxmotosdl/linuxmotosdl-graphics.h	2010-11-28 18:09:43 UTC (rev 54540)
@@ -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 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.