[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.166.2.2,2.166.2.3 script_v90he.cpp,2.281.2.2,2.281.2.3 sprite_he.cpp,1.153.2.1,1.153.2.2

kirben kirben at users.sourceforge.net
Fri Nov 18 15:24:00 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25899/scumm

Modified Files:
      Tag: branch-0-8-0
	script_v7he.cpp script_v90he.cpp sprite_he.cpp 
Log Message:

Revert +1 change, causes more glitches in lost.


Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.166.2.2
retrieving revision 2.166.2.3
diff -u -d -r2.166.2.2 -r2.166.2.3
--- script_v7he.cpp	17 Nov 2005 10:46:53 -0000	2.166.2.2
+++ script_v7he.cpp	18 Nov 2005 23:23:11 -0000	2.166.2.3
@@ -825,8 +825,8 @@
 		_wiz->_rectOverrideEnabled = true;
 		_wiz->_rectOverride.left = args[1];
 		_wiz->_rectOverride.top = args[2];
-		_wiz->_rectOverride.right = args[3] + 1;
-		_wiz->_rectOverride.bottom = args[4] + 1;
+		_wiz->_rectOverride.right = args[3];
+		_wiz->_rectOverride.bottom = args[4];
 		break;
 	case 43:
 		_wiz->_rectOverrideEnabled = false;

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.281.2.2
retrieving revision 2.281.2.3
diff -u -d -r2.281.2.2 -r2.281.2.3
--- script_v90he.cpp	19 Oct 2005 07:42:58 -0000	2.281.2.2
+++ script_v90he.cpp	18 Nov 2005 23:23:11 -0000	2.281.2.3
@@ -2613,8 +2613,8 @@
 		_wiz->_rectOverrideEnabled = true;
 		_wiz->_rectOverride.left = args[1];
 		_wiz->_rectOverride.top = args[2];
-		_wiz->_rectOverride.right = args[3] + 1;
-		_wiz->_rectOverride.bottom = args[4] + 1;
+		_wiz->_rectOverride.right = args[3];
+		_wiz->_rectOverride.bottom = args[4];
 		break;
 	case 43:
 		_wiz->_rectOverrideEnabled = false;

Index: sprite_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sprite_he.cpp,v
retrieving revision 1.153.2.1
retrieving revision 1.153.2.2
diff -u -d -r1.153.2.1 -r1.153.2.2
--- sprite_he.cpp	18 Oct 2005 02:11:25 -0000	1.153.2.1
+++ sprite_he.cpp	18 Nov 2005 23:23:12 -0000	1.153.2.2
@@ -936,8 +936,8 @@
 	_spriteGroups[spriteGroupId].flags |= kSGFClipBox;
 	_spriteGroups[spriteGroupId].bbox.left = x1;
 	_spriteGroups[spriteGroupId].bbox.top = y1;
-	_spriteGroups[spriteGroupId].bbox.right = x2 + 1;
-	_spriteGroups[spriteGroupId].bbox.bottom = y2 + 1;
+	_spriteGroups[spriteGroupId].bbox.right = x2;
+	_spriteGroups[spriteGroupId].bbox.bottom = y2;
 
 	redrawSpriteGroup(spriteGroupId);
 }





More information about the Scummvm-git-logs mailing list