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

[fingolfin at users.sourceforge.net]

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

Log Message:
-----------
DINGUX: More compilation fixes

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

Modified: scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.h
===================================================================
--- scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.h	2010-11-28 18:09:43 UTC (rev 54540)
+++ scummvm/trunk/backends/events/dinguxsdl/dinguxsdl-events.h	2010-11-28 18:10:12 UTC (rev 54541)
@@ -25,7 +25,6 @@
 
 #ifndef BACKENDS_EVENTS_SDL_DINGUX_H
 #define BACKENDS_EVENTS_SDL_DINGUX_H
-#if defined(DINGUX)
 
 #include "backends/events/sdl/sdl-events.h"
 
@@ -34,5 +33,4 @@
 	bool remapKey(SDL_Event &ev, Common::Event &event);
 };
 
-#endif /* DINGUX */
 #endif /* BACKENDS_EVENTS_SDL_DINGUX_H */

Modified: scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
===================================================================
--- scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp	2010-11-28 18:09:43 UTC (rev 54540)
+++ scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp	2010-11-28 18:10:12 UTC (rev 54541)
@@ -23,15 +23,16 @@
  *
  */
 
-#if defined (DINGUX)
+#if defined(DINGUX)
 
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
+
 #include "backends/graphics/dinguxsdl/dinguxsdl-graphics.h"
 #include "backends/events/dinguxsdl/dinguxsdl-events.h"
 #include "graphics/scaler/aspect.h"
+#include "common/mutex.h"
 
-// Disable symbol overrides so that we can use system headers.
-#define FORBIDDEN_SYMBOL_EXCEPTION_FILE
-
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{"1x", "Standard", GFX_NORMAL},
 	{0, 0, 0}
@@ -502,10 +503,6 @@
 	return &_videoMode;
 }
 
-bool DINGUXSdlGraphicsManager::isOverlayVisible() {
-	return _overlayVisible;
-}
-
 void DINGUXSdlGraphicsManager::warpMouse(int x, int y) {
 	if (_mouseCurState.x != x || _mouseCurState.y != y) {
 		if (_videoMode.mode == GFX_HALF && !_overlayVisible) {
@@ -522,8 +519,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/dinguxsdl/dinguxsdl-graphics.h
===================================================================
--- scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h	2010-11-28 18:09:43 UTC (rev 54540)
+++ scummvm/trunk/backends/graphics/dinguxsdl/dinguxsdl-graphics.h	2010-11-28 18:10:12 UTC (rev 54541)
@@ -25,7 +25,6 @@
 
 #ifndef BACKENDS_GRAPHICS_SDL_DINGUX_H
 #define BACKENDS_GRAPHICS_SDL_DINGUX_H
-#if defined (DINGUX)
 
 #include "backends/graphics/sdl/sdl-graphics.h"
 
@@ -67,5 +66,4 @@
 	SdlEventSource *_evSrc;
 };
 
-#endif /* DINGUX */
 #endif /* BACKENDS_GRAPHICS_SDL_DINGUX_H */


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