[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.24,1.25 wince-sdl.h,1.16,1.17

Pawel Kolodziejski aquadran at users.sourceforge.net
Tue Mar 15 01:44:55 CET 2005


Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8256

Modified Files:
	wince-sdl.cpp wince-sdl.h 
Log Message:
fixed compilation for for overlay SDL latest changes, and formating code.
Wince SDL port is currently broken, it crash at NULL _screen pointer while locking SDL surface inside OSystem_SDL::clearScreen() func

Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- wince-sdl.cpp	9 Mar 2005 23:07:29 -0000	1.24
+++ wince-sdl.cpp	15 Mar 2005 09:43:37 -0000	1.25
@@ -733,24 +733,24 @@
 	get_sample_rate();
 }
 
-void OSystem_WINCE3::initSize(uint w, uint h, int overlaySize) {
+void OSystem_WINCE3::initSize(uint w, uint h, int overlayScale) {
 
-		if (_isSmartphone && h == 240)
-			h = 200;  // mainly for the launcher
+	if (_isSmartphone && h == 240)
+		h = 200;  // mainly for the launcher
 
-        switch (_transactionMode) {
-			case kTransactionActive:
-                _transactionDetails.w = w;
-                _transactionDetails.wChanged = true;
-                _transactionDetails.h = h;
-                _transactionDetails.hChanged = true;
-                return;
-                break;
-			case kTransactionCommit:
-                break;
-			default:
-                break;
-        }
+	switch (_transactionMode) {
+		case kTransactionActive:
+			_transactionDetails.w = w;
+			_transactionDetails.h = h;
+			_transactionDetails.overlayScale = overlayScale;
+			_transactionDetails.sizeChanged = true;
+			return;
+			break;
+		case kTransactionCommit:
+			break;
+		default:
+			break;
+	}
 
 	if (w == 320 && h == 200 && !_isSmartphone)
 		h = 240; // use the extra 40 pixels height for the toolbar

Index: wince-sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- wince-sdl.h	9 Mar 2005 23:07:29 -0000	1.16
+++ wince-sdl.h	15 Mar 2005 09:43:38 -0000	1.17
@@ -34,8 +34,10 @@
 #include "CEDevice.h"
 #include "CEScaler.h"
 
-#include <SDL.h>

-

+#include <SDL.h>
+
+
+
 #define TOTAL_ZONES 3
 
 class OSystem_WINCE3 : public OSystem_SDL {
@@ -73,7 +75,8 @@
 	void swap_zoom_down();
 
 //#ifdef WIN32_PLATFORM_WFSP
-	// Smartphone actions

+	// Smartphone actions
+
 	void initZones();
 	void loadSmartphoneConfigurationElement(String element, int &value, int defaultValue);
 	void loadSmartphoneConfiguration();
@@ -183,22 +186,20 @@
 	int _stepX3;				// offset for left and right cursor moves (fastest)
 	int _stepY1;				// offset for up and down cursor moves (slowest)
 	int _stepY2;				// offset for up and down cursor moves (faster)
-	int _stepY3;				// offset for up and down cursor moves (fastest)

-

-	int _mouseXZone[TOTAL_ZONES];

-	int _mouseYZone[TOTAL_ZONES];

-	int _currentZone;

-

-	typedef struct zoneDesc {

-		    int x;

-	        int y;

-			int width;

-			int height;

-	} zoneDesc;

-

-	static zoneDesc _zones[TOTAL_ZONES];

-

+	int _stepY3;				// offset for up and down cursor moves (fastest)
+
+	int _mouseXZone[TOTAL_ZONES];
+	int _mouseYZone[TOTAL_ZONES];
+	int _currentZone;
 
+	typedef struct zoneDesc {
+		int x;
+		int y;
+		int width;
+		int height;
+	} zoneDesc;
+
+	static zoneDesc _zones[TOTAL_ZONES];
 };
 
 #endif





More information about the Scummvm-git-logs mailing list