[Scummvm-cvs-logs] CVS: scummvm/scumm saveload.cpp,1.69,1.70 scummvm.cpp,2.148,2.149 verbs.cpp,1.38,1.39 verbs.h,1.4,1.5

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26744

Modified Files:
	saveload.cpp scummvm.cpp verbs.cpp verbs.h 
Log Message:
some more ScummVM::Rect

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- saveload.cpp	15 May 2003 22:30:31 -0000	1.69
+++ saveload.cpp	15 May 2003 22:36:42 -0000	1.70
@@ -355,10 +355,10 @@
 		MKLINE(VerbSlot, y, sleInt16, VER_V8),
 		MKLINE(VerbSlot, right, sleInt16, VER_V8),
 		MKLINE(VerbSlot, bottom, sleInt16, VER_V8),
-		MKLINE(VerbSlot, oldleft, sleInt16, VER_V8),
-		MKLINE(VerbSlot, oldtop, sleInt16, VER_V8),
-		MKLINE(VerbSlot, oldright, sleInt16, VER_V8),
-		MKLINE(VerbSlot, oldbottom, sleInt16, VER_V8),
+		MKLINE(VerbSlot, old.left, sleInt16, VER_V8),
+		MKLINE(VerbSlot, old.top, sleInt16, VER_V8),
+		MKLINE(VerbSlot, old.right, sleInt16, VER_V8),
+		MKLINE(VerbSlot, old.bottom, sleInt16, VER_V8),
 
 		MKLINE_OLD(VerbSlot, verbid, sleByte, VER_V8, VER_V11),
 		MKLINE(VerbSlot, verbid, sleInt16, VER_V12),

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.148
retrieving revision 2.149
diff -u -d -r2.148 -r2.149
--- scummvm.cpp	15 May 2003 21:55:13 -0000	2.148
+++ scummvm.cpp	15 May 2003 22:36:42 -0000	2.149
@@ -701,7 +701,7 @@
 	for (i = 0; i < _maxVerbs; i++) {
 		_verbs[i].verbid = 0;
 		_verbs[i].right = _screenWidth - 1;
-		_verbs[i].oldleft = -1;
+		_verbs[i].old.left = -1;
 		_verbs[i].type = 0;
 		_verbs[i].color = 2;
 		_verbs[i].hicolor = 0;

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- verbs.cpp	15 May 2003 22:30:32 -0000	1.38
+++ verbs.cpp	15 May 2003 22:36:43 -0000	1.39
@@ -186,10 +186,7 @@
 
 		vs->right = _charset->_str.right;
 		vs->bottom = _charset->_str.bottom;
-		vs->oldleft = _charset->_str.left;
-		vs->oldright = _charset->_str.right;
-		vs->oldtop = _charset->_str.top;
-		vs->oldbottom = _charset->_str.bottom;
+		vs->old = _charset->_str;
 		_charset->_str.left = _charset->_str.right;
 	} else {
 		restoreVerbBG(verb);
@@ -201,9 +198,9 @@
 
 	vs = &_verbs[verb];
 
-	if (vs->oldleft != -1) {
-		restoreBG(ScummVM::Rect(vs->oldleft, vs->oldtop, vs->oldright, vs->oldbottom), vs->bkcolor);
-		vs->oldleft = -1;
+	if (vs->old.left != -1) {
+		restoreBG(vs->old, vs->bkcolor);
+		vs->old.left = -1;
 	}
 }
 
@@ -276,10 +273,10 @@
 	vst = &_verbs[verb];
 	vst->right = vst->x + imgw * 8;
 	vst->bottom = vst->y + imgh * 8;
-	vst->oldleft = vst->x;
-	vst->oldright = vst->right;
-	vst->oldtop = vst->y;
-	vst->oldbottom = vst->bottom;
+	vst->old.left = vst->x;
+	vst->old.right = vst->right;
+	vst->old.top = vst->y;
+	vst->old.bottom = vst->bottom;
 
 	gdi.enableZBuffer();
 

Index: verbs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/verbs.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- verbs.h	6 Mar 2003 21:46:32 -0000	1.4
+++ verbs.h	15 May 2003 22:36:43 -0000	1.5
@@ -21,7 +21,8 @@
 #ifndef VERBS_H
 #define VERBS_H
 
-#include "scummsys.h"
+#include "common/scummsys.h"
+#include "common/rect.h"
 
 enum {
 	kTextVerbType = 0,
@@ -31,7 +32,7 @@
 struct VerbSlot {
 	int16 x, y;
 	int16 right, bottom;
-	int16 oldleft, oldtop, oldright, oldbottom;
+	ScummVM::Rect old;
 	uint16 verbid;
 	uint8 color, hicolor, dimcolor, bkcolor, type;
 	uint8 charset_nr, curmode;