[Scummvm-cvs-logs] SF.net SVN: scummvm: [26823] scummvm/trunk/engines/agos/verb.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Sun May 13 06:11:19 CEST 2007


Revision: 26823
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26823&view=rev
Author:   kirben
Date:     2007-05-12 21:11:19 -0700 (Sat, 12 May 2007)

Log Message:
-----------
Fix bug in original Simon the Sorcerer 2, the x position in invertBox() needs to be adjusted for scrolling locations.

Modified Paths:
--------------
    scummvm/trunk/engines/agos/verb.cpp

Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp	2007-05-13 02:32:38 UTC (rev 26822)
+++ scummvm/trunk/engines/agos/verb.cpp	2007-05-13 04:11:19 UTC (rev 26823)
@@ -842,22 +842,13 @@
 	int w, h, i;
 
 	_lockWord |= 0x8000;
-	src = getFrontBuf() + ha->y * _dxSurfacePitch + ha->x;
+	src = getFrontBuf() + ha->y * _dxSurfacePitch + (ha->x - _scrollX * 8);
 
 	_litBoxFlag = true;
 
 	w = ha->width;
 	h = ha->height;
 
-	// Works around bug in original Simon the Sorcerer 2
-	// Animations continue in background when load/save dialog is open
-	// often causing the savegame name highlighter to be cut short
-	if (!(h > 0 && w > 0 && ha->x + w <= _screenWidth && ha->y + h <= _screenHeight)) {
-		debug(1,"Invalid coordinates in invertBox (%d,%d,%d,%d)", ha->x, ha->y, ha->width, ha->height);
-		_lockWord &= ~0x8000;
-		return;
-	}
-
 	do {
 		for (i = 0; i != w; ++i) {
 			color = src[i];


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




More information about the Scummvm-git-logs mailing list