[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.177,1.178 script_v6he.cpp,2.87,2.88 scumm.h,1.446,1.447

[Travis Howell]

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

Modified Files:
	object.cpp script_v6he.cpp scumm.h 
Log Message:

A few changes for freddemo


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- object.cpp	22 Aug 2004 23:37:59 -0000	1.177
+++ object.cpp	23 Aug 2004 00:17:06 -0000	1.178
@@ -411,6 +411,9 @@
 };
 
 void ScummEngine::drawObject(int obj, int arg) {
+	if (_skipDrawObject)
+		return;
+
 	ObjectData &od = _objs[obj];
 	int xpos, ypos, height, width;
 	const byte *ptr;

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.87
retrieving revision 2.88
diff -u -d -r2.87 -r2.88
--- script_v6he.cpp	22 Aug 2004 09:47:12 -0000	2.87
+++ script_v6he.cpp	23 Aug 2004 00:17:06 -0000	2.88
@@ -529,6 +529,11 @@
 		_saveLoadSlot = 1;
 		_saveTemporaryState = true;
 		break;
+	case 234:
+		b = pop();
+		a = pop();
+		warning("o6_roomOps: case %d (%d, %d)", op, b, a);
+		break;
 	default:
 		error("o6_roomOps: default case %d", op);
 	}
@@ -761,6 +766,12 @@
 	case 5:
 		//Used before mini games in 3DO versions, seems safe to ignore.
 		break;
+	case 20:
+		_skipDrawObject = 1;
+		break;
+	case 21:
+		_skipDrawObject = 0;
+		break;
 	default:
 		error("o6_kernelSetFunctions: default case %d (param count %d)", args[0], num);
 		break;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.446
retrieving revision 1.447
diff -u -d -r1.446 -r1.447
--- scumm.h	22 Aug 2004 23:38:00 -0000	1.446
+++ scumm.h	23 Aug 2004 00:17:07 -0000	1.447
@@ -1032,6 +1032,7 @@
 	byte _roomPalette[256];
 	byte *_shadowPalette;
 	int _heSndSoundFreq, _heSndOffset, _heSndTimer, _heSndSoundId, _heSndLoop;
+	bool _skipDrawObject;
 
 protected:
 	int _shadowPaletteSize;