[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.73,1.74 boxes.cpp,1.14,1.15 costume.cpp,1.15,1.16 gfx.cpp,2.37,2.38 script_v5.cpp,1.22,1.23 scummvm.cpp,2.70,2.71 string.cpp,1.97,1.98

[Pawel Kolodziejski]

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

Modified Files:
	actor.cpp boxes.cpp costume.cpp gfx.cpp script_v5.cpp 
	scummvm.cpp string.cpp 
Log Message:
changed range from GF_OLD256 to GF_AFTER_V3

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- actor.cpp	28 Mar 2003 23:08:36 -0000	1.73
+++ actor.cpp	8 Apr 2003 19:05:36 -0000	1.74
@@ -822,7 +822,7 @@
 	for (i = 1; i < NUM_ACTORS; i++) {
 		a = derefActor(i);
 		if (a->isInCurrentRoom())
-			if (_features & GF_OLD256)
+			if (_features & GF_AFTER_V3)
 				a->walkActorOld();
 			else
 				a->walkActor();

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- boxes.cpp	6 Mar 2003 21:45:52 -0000	1.14
+++ boxes.cpp	8 Apr 2003 19:05:38 -0000	1.15
@@ -209,7 +209,7 @@
 		return NULL;
 	checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
 	if (_features & GF_SMALL_HEADER) {
-		if (_features & GF_OLD256)
+		if (_features & GF_AFTER_V3) // GF_OLD256 or GF_AFTER_V3 ?
 			return (Box *)(ptr + box * (SIZEOF_BOX - 2) + 1);
 		else
 			return (Box *)(ptr + box * SIZEOF_BOX + 1);

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/costume.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- costume.cpp	7 Apr 2003 22:47:36 -0000	1.15
+++ costume.cpp	8 Apr 2003 19:05:39 -0000	1.16
@@ -1226,7 +1226,7 @@
 	_srcptr = _loaded._ptr + READ_LE_UINT16(_frameptr + code * 2);
 
 	if (code != 0x7B) {
-		if (!(_vm->_features & GF_OLD256) || code < 0x79)
+		if (!(_vm->_features & GF_OLD256) || code < 0x79) // GF_OLD256 or GF_AFTER_V3 ?
 			return mainRoutine(limb, code);
 	}
 
@@ -1261,7 +1261,7 @@
 		return;
 	}
 
-	if (_features & GF_OLD256)
+	if (_features & GF_AFTER_V3)
 		dataptr = p + *(p + lc._numColors + 8);
 	else
 		dataptr = p + READ_LE_UINT16(p + lc._numColors + 8);
@@ -1271,7 +1271,7 @@
 	i = 0;
 	do {
 		if (mask & 0x8000) {
-			if (_features & GF_OLD256) {
+			if (_features & GF_AFTER_V3) {
 				j = 0;
 				j = *(r);
 				r++;

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -d -r2.37 -r2.38
--- gfx.cpp	7 Apr 2003 22:47:37 -0000	2.37
+++ gfx.cpp	8 Apr 2003 19:05:39 -0000	2.38
@@ -366,7 +366,7 @@
 	byte *src;
 
 	updateDirtyScreen(2);
-	if (_features & GF_OLD256)
+	if (_features & GF_AFTER_V3)
 		updateDirtyScreen(1);
 
 	if (camera._last.x == camera._cur.x && (camera._last.y == camera._cur.y || !(_features & GF_AFTER_V7))) {
@@ -522,7 +522,7 @@
 	}
 
 	room = getResourceAddress(rtRoom, _roomResource);
-	if (_features & GF_OLD256) {
+	if (_features & GF_AFTER_V3) {
 		// FIXME - maybe this should check for multiple planes like we do
 		// for GF_SMALL_HEADER already.
 		gdi._numZBuffer = 2;
@@ -854,7 +854,7 @@
 		    (ptr[-4] == 'O' && ptr[-3] == 'I' && READ_LE_UINT32(ptr - 8) > READ_LE_UINT32(ptr) + 12)) {
 			zplane_list[1] = smap_ptr + READ_LE_UINT32(ptr);
 			// FIXME - how does GF_OLD256 encode the multiple zplanes?
-			if (!(_vm->_features & GF_OLD256))
+			if (!(_vm->_features & GF_AFTER_V3))
 				for (i = 2; i < numzbuf; i++) {
 					zplane_list[i] = zplane_list[i-1] + READ_LE_UINT16(zplane_list[i-1]);
 			}
@@ -984,7 +984,7 @@
 				if (!zplane_list[i])
 					continue;
 
-				if (_vm->_features & GF_OLD256)
+				if (_vm->_features & GF_AFTER_V3) // GF_OLD256 or GF_AFTER_V3 ?
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 4);
 				else if (_vm->_features & GF_SMALL_HEADER)
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- script_v5.cpp	7 Apr 2003 21:01:49 -0000	1.22
+++ script_v5.cpp	8 Apr 2003 19:05:40 -0000	1.23
@@ -183,7 +183,7 @@
 		OPCODE(o5_walkActorToObject),
 		OPCODE(o5_startObject),
 		/* 78 */
-		OPCODE(o5_isGreater),				/* less? */
+		OPCODE(o5_isGreater),
 		OPCODE(o5_doSentence),
 		OPCODE(o5_verbOps),
 		OPCODE(o5_getActorWalkBox),
@@ -198,7 +198,7 @@
 		OPCODE(o5_startMusic),
 		OPCODE(o5_getActorRoom),
 		/* 84 */
-		OPCODE(o5_isGreaterEqual),	/* less equal? */
+		OPCODE(o5_isGreaterEqual),
 		OPCODE(o5_drawObject),
 		OPCODE(o5_getActorElevation),
 		OPCODE(o5_setState),
@@ -1318,7 +1318,7 @@
 void Scumm_v5::o5_matrixOps() {
 	int a, b;
 
-	if (_features & GF_OLD256) {
+	if (_features & GF_AFTER_V3) {
 		a = getVarOrDirectByte(0x80);
 		b = fetchScriptByte();
 		setBoxFlags(a, b);
@@ -1492,7 +1492,7 @@
 		ensureResourceLoaded(resType[_opcode-1], resid);
 		break;
 	case 4:											// load room 
-		if (_gameId == GID_ZAK256) {
+		if (_features == GF_AFTER_V3) {
 			ensureResourceLoaded(rtRoom, resid);
 			if (resid > 0x7F)
 				resid = _resourceMapper[resid & 0x7F];
@@ -1596,7 +1596,7 @@
 void Scumm_v5::o5_roomOps() {
 	int a = 0, b = 0, c, d, e;
 
-	if (_features & GF_OLD256) {
+	if (_features & GF_AFTER_V3) {
 		a = getVarOrDirectWord(0x80);
 		b = getVarOrDirectWord(0x40);
 	}
@@ -1604,7 +1604,7 @@
 	_opcode = fetchScriptByte();
 	switch (_opcode & 0x1F) {
 	case 1:											/* room scroll */
-		if (!(_features & GF_OLD256)) {
+		if (!(_features & GF_AFTER_V3)) {
 			a = getVarOrDirectWord(0x80);
 			b = getVarOrDirectWord(0x40);
 		}
@@ -1621,7 +1621,7 @@
 		break;
 	case 2:											/* room color */
 		if (_features & GF_SMALL_HEADER) {
-			if (!(_features & GF_OLD256)) {
+			if (!(_features & GF_AFTER_V2)) {
 				a = getVarOrDirectWord(0x80);
 				b = getVarOrDirectWord(0x40);
 			}
@@ -1639,7 +1639,7 @@
 		break;
 
 	case 3:											/* set screen */
-		if (!(_features & GF_OLD256)) {
+		if (!(_features & GF_AFTER_V3)) {
 			a = getVarOrDirectWord(0x80);
 			b = getVarOrDirectWord(0x40);
 		}
@@ -1647,7 +1647,7 @@
 		break;
 	case 4:											/* set palette color */
 		if (_features & GF_SMALL_HEADER) {
-			if (!(_features & GF_OLD256)) {
+			if (!(_features & GF_AFTER_V3)) {
 				a = getVarOrDirectWord(0x80);
 				b = getVarOrDirectWord(0x40);
 			}
@@ -1681,7 +1681,7 @@
 		break;
 	case 8:											/* room scale? */
 		if (_features & GF_SMALL_HEADER) {
-			if (!(_features & GF_OLD256)) {
+			if (!(_features & GF_AFTER_V3)) {
 				a = getVarOrDirectWord(0x80);
 				b = getVarOrDirectWord(0x40);
 			}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.70
retrieving revision 2.71
diff -u -d -r2.70 -r2.71
--- scummvm.cpp	7 Apr 2003 06:34:42 -0000	2.70
+++ scummvm.cpp	8 Apr 2003 19:05:40 -0000	2.71
@@ -414,7 +414,7 @@
 	clearDrawObjectQueue();
 
 	for (i = 0; i < 6; i++) {
-		if (_features & GF_OLD256) {
+		if (_features & GF_AFTER_V3) { // GF_OLD256 or GF_AFTER_V3 ?
 			_string[i].t_xpos = 0;
 			_string[i].t_ypos = 0;
 		} else {
@@ -911,7 +911,7 @@
 		if (ptr) {
 			byte numOfBoxes = *(ptr);
 			int size;
-			if (_features & GF_OLD256)
+			if (_features & GF_AFTER_V3) // GF_OLD256 or GF_AFTER_V3 ?
 				size = numOfBoxes * (SIZEOF_BOX - 2) + 1;
 			else
 				size = numOfBoxes * SIZEOF_BOX + 1;
@@ -1229,7 +1229,7 @@
 	else
 		_virtual_mouse_y = mouse.y;
 
-	if (!(_features & GF_OLD256))
+	if (!(_features & GF_AFTER_V3))
 		_virtual_mouse_y += virtscr[0].topline;
 	else
 		_virtual_mouse_y -= 16;
@@ -1237,7 +1237,7 @@
 	if (_virtual_mouse_y < 0)
 		_virtual_mouse_y = -1;
 
-	if (_features & GF_OLD256) {
+	if (_features & GF_AFTER_V3) {
 		if (_virtual_mouse_y >= virtscr[0].height + virtscr[0].topline)
 			_virtual_mouse_y = -1;
 	} else {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- string.cpp	7 Apr 2003 23:31:42 -0000	1.97
+++ string.cpp	8 Apr 2003 19:05:41 -0000	1.98
@@ -144,7 +144,7 @@
 	_charset->_right = _string[0].right;
 	_charset->_color = _charsetColor;
 
-	if (!(_features & GF_OLD256))	// FIXME
+	if (!(_features & GF_AFTER_V3))	// FIXME
 		for (i = 0; i < 4; i++)
 			_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];
 
@@ -187,7 +187,7 @@
 	_talkDelay = _defaultTalkDelay;
 
 	if (!_keepText) {
-		if (_features & GF_OLD256) {
+		if (_features & GF_AFTER_V3) {
 			gdi._mask_left = _string[0].xpos;
 			gdi._mask_top = _string[0].ypos;
 			gdi._mask_bottom = _string[0].ypos + 8;
@@ -227,7 +227,7 @@
 		}
 		if (c == 13) {
 		newLine:;
-			if (_features & GF_OLD256) {
+			if (_features & GF_AFTER_V3) {
 				_charset->_nextTop = 8;
 				_charset->_nextLeft = 0;
 				continue;
@@ -248,7 +248,7 @@
 		if (c != 0xFF) {
 			_charset->_left = _charset->_nextLeft;
 			_charset->_top = _charset->_nextTop;
-			if (_features & GF_OLD256) {
+			if (_features & GF_AFTER_V3) {
 				_charset->printChar(c);
 			} else if (_features & GF_AFTER_V6) {
 				if (!_noSubtitles || (_haveMsg != 0xFE && _haveMsg != 0xFF))
@@ -410,7 +410,7 @@
 	_charset->_disableOffsX = _charset->_firstChar = true;
 	_charset->setCurID(_string[a].charset);
 
-	if (!(_features & GF_OLD256)) {
+	if (!(_features & GF_AFTER_V3)) {
 		for (i = 0; i < 4; i++)
 			_charsetColorMap[i] = _charsetData[_charset->getCurID()][i];