[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.30,1.31

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Apr 13 13:17:01 CEST 2003


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

Modified Files:
	script_v5.cpp 
Log Message:
added specific opcodes for indy ega same as at indy 256, and dummy opcode for loom ega

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- script_v5.cpp	13 Apr 2003 16:42:33 -0000	1.30
+++ script_v5.cpp	13 Apr 2003 20:15:44 -0000	1.31
@@ -949,8 +949,12 @@
 }
 
 void Scumm_v5::o5_getActorScale() {
+	// dummy opcode in the loom
+	if (_gameId == GID_LOOM)
+		return;
+
 	// INDY3 uses this opcode as a wait_for_actor();
-	if (_gameId == GID_INDY3_256) {
+	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
 		byte *oldaddr = _scriptPointer - 1;
 		if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) {
 			_scriptPointer = oldaddr;
@@ -2248,7 +2252,7 @@
 
 	oldaddr = _scriptPointer - 1;
 
-	if (_gameId == GID_INDY3_256) {
+	if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
 		_opcode = 2;
 	} else
 		_opcode = fetchScriptByte();





More information about the Scummvm-git-logs mailing list