[Scummvm-cvs-logs] CVS: scummvm/scumm script_v7he.cpp,2.168,2.169 script_v90he.cpp,2.288,2.289 sprite_he.cpp,1.155,1.156

[kirben]

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

Modified Files:
	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.168
retrieving revision 2.169
diff -u -d -r2.168 -r2.169
--- script_v7he.cpp	5 Nov 2005 00:14:34 -0000	2.168
+++ script_v7he.cpp	6 Nov 2005 11:29:08 -0000	2.169
@@ -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.288
retrieving revision 2.289
diff -u -d -r2.288 -r2.289
--- script_v90he.cpp	30 Oct 2005 04:02:45 -0000	2.288
+++ script_v90he.cpp	6 Nov 2005 11:29:08 -0000	2.289
@@ -2614,8 +2614,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.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- sprite_he.cpp	22 Oct 2005 22:54:59 -0000	1.155
+++ sprite_he.cpp	6 Nov 2005 11:29:08 -0000	1.156
@@ -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);
 }