[Scummvm-cvs-logs] SF.net SVN: scummvm:[52599] scummvm/trunk/backends/platform/sdl

[djwillis at users.sourceforge.net]

Revision: 52599
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52599&view=rev
Author:   djwillis
Date:     2010-09-06 17:28:17 +0000 (Mon, 06 Sep 2010)

Log Message:
-----------
SDL: Add masks to the SDL backend to support the OpenPandora backend.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/graphics.cpp
    scummvm/trunk/backends/platform/sdl/main.cpp

Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp	2010-09-06 17:22:22 UTC (rev 52598)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp	2010-09-06 17:28:17 UTC (rev 52599)
@@ -539,7 +539,7 @@
 	assert(_inited);
 	_forceFull = true;
 
-#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(DINGUX)
+#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(DINGUX) && !defined(OPENPANDORA)
 	_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
 	_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
 
@@ -785,7 +785,7 @@
 #endif
 
 	// If the shake position changed, fill the dirty area with blackness
-	if (_currentShakePos != _newShakePos || 
+	if (_currentShakePos != _newShakePos ||
 		(_mouseNeedsRedraw && _mouseBackup.y <= _currentShakePos)) {
 		SDL_Rect blackrect = {0, 0, _videoMode.screenWidth * _videoMode.scaleFactor, _newShakePos * _videoMode.scaleFactor};
 

Modified: scummvm/trunk/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/main.cpp	2010-09-06 17:22:22 UTC (rev 52598)
+++ scummvm/trunk/backends/platform/sdl/main.cpp	2010-09-06 17:28:17 UTC (rev 52599)
@@ -38,7 +38,7 @@
 
 // Several SDL based ports use a custom main, and hence do not want to compile
 // of this file. The following "#if" ensures that.
-#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) && !defined(__SYMBIAN32__) && !defined(DINGUX)
+#if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(CAANOO) && !defined(GP2XWIZ) && !defined(LINUXMOTO) && !defined(OPENPANDORA) && !defined(__SYMBIAN32__) && !defined(DINGUX)
 
 
 #include "backends/platform/sdl/sdl.h"


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