[Scummvm-cvs-logs] CVS: scummvm/scumm script_v2.cpp,2.136,2.137 scummvm.cpp,2.224,2.225

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Jun 6 21:26:02 CEST 2003


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

Modified Files:
	script_v2.cpp scummvm.cpp 
Log Message:
init costumes for v1 games

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.136
retrieving revision 2.137
diff -u -d -r2.136 -r2.137
--- script_v2.cpp	7 Jun 2003 00:49:36 -0000	2.136
+++ script_v2.cpp	7 Jun 2003 04:24:57 -0000	2.137
@@ -683,15 +683,6 @@
 	switch (_opcode) {
 		case 1: 	// Actor Sound
 			a->sound[0] = arg;
-			
-#if 0
-			// FIXME: This hack would make costume draw. However, until
-			// we have added support for the V1 costume format, this hurts
-			// more than it helps.
-			if (_version == 1 && vm.slot[_currentScript].number == 1) {
-				a->setActorCostume(act);
-			}
-#endif
 			break;
 
 		case 2:		// Actor Set Color

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.224
retrieving revision 2.225
diff -u -d -r2.224 -r2.225
--- scummvm.cpp	7 Jun 2003 00:49:36 -0000	2.224
+++ scummvm.cpp	7 Jun 2003 04:24:57 -0000	2.225
@@ -819,6 +819,10 @@
 	for (i = 1; i < _numActors; i++) {
 		_actors[i].number = i;
 		_actors[i].initActor(1);
+		
+		// this is from IDB
+		if (_version == 1)
+			_actors[i].costume = i;
 	}
 
 	_numNestedScripts = 0;





More information about the Scummvm-git-logs mailing list