[Scummvm-cvs-logs] CVS: scummvm/backends/wince screen.cpp,1.11,1.12

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1:/tmp/cvs-serv24842

Modified Files:
	screen.cpp 
Log Message:
Fix dumb overlay overflow

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/screen.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- screen.cpp	20 Jan 2003 08:01:45 -0000	1.11
+++ screen.cpp	21 Jan 2003 22:36:53 -0000	1.12
@@ -156,7 +156,7 @@
 
 void hicolor565_Blt(UBYTE*);
 void hicolor565_Blt_part(UBYTE*, int, int, int, int, UBYTE*, int);
-void hicolor565_Get_565(INT16*, int, int, int, int, int);
+//void hicolor565_Get_565(INT16*, int, int, int, int, int);
 void hicolor565_Set_565(INT16*, int, int, int, int, int);
 
 void noGAPI_Cls();
@@ -164,7 +164,7 @@
 void noGAPI_Blt_part(UBYTE*, int, int, int, int, UBYTE*, int);
 void noGAPI_Set_565(INT16*, int, int, int, int, int);
 
-void NULL_Get_565(INT16*, int, int, int, int, int);
+//void NULL_Get_565(INT16*, int, int, int, int, int);
 void NULL_Set_565(INT16*, int, int, int, int, int);
 
 void palette_update();
@@ -353,12 +353,12 @@
 	
 	memset(&gxdp, 0, sizeof(gxdp));
 
-	if (!noGAPI)
-		gxdp = dynamicGXGetDisplayProperties();
-	else {
-			gxdp.cxWidth = GetSystemMetrics(SM_CXSCREEN);
-			gxdp.cyHeight = GetSystemMetrics(SM_CYSCREEN);
-			gxdp.ffFormat = 0xA8; 
+	if (!noGAPI)
+		gxdp = dynamicGXGetDisplayProperties();
+	else {
+			gxdp.cxWidth = GetSystemMetrics(SM_CXSCREEN);
+			gxdp.cyHeight = GetSystemMetrics(SM_CYSCREEN);
+			gxdp.ffFormat = 0xA8; 
 	}
 
 	// Possible Aero problem
@@ -2327,8 +2327,8 @@
 
 	// Dumb conversion to 565
 
-	for (i=0; i<240; i++) {
-		for (j=0; j<320; j++) {
+	for (i=0; i<height; i++) {
+		for (j=0; j<width; j++) {
 			*buffer++ = COLORCONV565(palRed[*src], palGreen[*src], palBlue[*src]);
 			src++;
 		}