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

[Nicolas Bacca]

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

Modified Files:
	screen.cpp 
Log Message:
Fix screen limit (Zak)

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/screen.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- screen.cpp	25 May 2003 12:28:38 -0000	1.18
+++ screen.cpp	13 Jul 2003 12:28:01 -0000	1.19
@@ -990,11 +990,17 @@
 	if (toolbar_available && !toolbar_drawn && !hide_toolbar)
 		drawAllToolbar();
 
+	if (y > _geometry_h)
+		return;
+
+	if (y + height > _geometry_h)
+		height = _geometry_h - y;
+
 	pBlt_part(src_ptr, x, y, width, height, NULL, pitch);
 
-	if (check && (y > _geometry_h || (y + height) > _geometry_h)) {
-		toolbar_drawn = false;
-	}
+	//if (check && (y > _geometry_h || (y + height) > _geometry_h)) {
+	//	toolbar_drawn = false;
+	//}
 
 }
 
@@ -1149,8 +1155,10 @@
 			scr_ptr_limit = scr_ptr + (pitch ? pitch : width) * height;
 			src_limit = scr_ptr + width;
 
+			/*
 			 if (scr_ptr_limit > scr_ptr + geom[useMode].lineLimit)
                 scr_ptr_limit = scr_ptr + geom[useMode].lineLimit;
+			*/
 
 			/* CMI rendering */
             if (high_res && !own_palette && !extra_wide_screen) {
@@ -1704,8 +1712,10 @@
 		scr_ptr_limit = scr_ptr + (pitch ? pitch : width) * height;
         src_limit = scr_ptr + width;
 
+		/*
 		if (scr_ptr_limit > scr_ptr + geom[useMode].lineLimit)
             scr_ptr_limit = scr_ptr + geom[useMode].lineLimit;
+		*/
 
 		/* CMI rendering */
         if (high_res && !own_palette && !extra_wide_screen) {
@@ -1926,8 +1936,10 @@
         scraddr += y * linestep;
         scr_ptr_limit = scr_ptr + (pitch ? pitch : width) * height;
 
+		/*
 		if (scr_ptr_limit > scr_ptr + geom[useMode].lineLimit)
             scr_ptr_limit = scr_ptr + geom[useMode].lineLimit;
+		*/
 
         src_limit = scr_ptr + width;
 
@@ -2277,8 +2289,10 @@
 		scraddr += y * linestep;
 		scr_ptr_limit = scr_ptr + (pitch ? pitch : width) * height;
 
+		/*
 		if (scr_ptr_limit > scr_ptr + geom[useMode].lineLimit)
 			scr_ptr_limit = scr_ptr + geom[useMode].lineLimit;
+		*/
 
 		src_limit = scr_ptr + width;