[Scummvm-cvs-logs] SF.net SVN: scummvm: [22404] scummvm/trunk/engines/kyra/animator.cpp

[lordhoto at users.sourceforge.net]

Revision: 22404
Author:   lordhoto
Date:     2006-05-10 13:45:42 -0700 (Wed, 10 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22404&view=rev

Log Message:
-----------
Adds clipping to the workaround in "preserveOrRestoreBackground", so it does not overwrite the interface.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/animator.cpp
Modified: scummvm/trunk/engines/kyra/animator.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator.cpp	2006-05-10 20:30:58 UTC (rev 22403)
+++ scummvm/trunk/engines/kyra/animator.cpp	2006-05-10 20:45:42 UTC (rev 22404)
@@ -196,7 +196,7 @@
 	int temp;
 	
 	temp = x + width;
-	if (temp >= 40) {
+	if (temp >= 39) {
 		x = 39 - width;
 	}
 	temp = y + height;
@@ -211,6 +211,18 @@
 		// isn't updated on the front buffer in that special scene, so we update
 		// the frontbuffer (screen page 0) too if the object get's redrawn this time
 		if (obj->refreshFlag) {
+			// do not overwrite the interface
+			if (x <= 1) {
+				width--;
+				x = 1;
+			} else if (x >= 39) {
+				x = 39 - width;
+			}
+			if (y <= 8) {
+				y = 8;
+			} else if (y >= 136) {
+				y = 136 - height;
+			}
 			_screen->copyBlockToPage(0, x << 3, y, width << 3, height, obj->background);
 		}
 	} else {


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