[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.149.2.5,1.149.2.6

[Max Horn]

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

Modified Files:
      Tag: branch-0-6-0
	script.cpp 
Log Message:
Fix incorrect flObject base address computation

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.149.2.5
retrieving revision 1.149.2.6
diff -u -d -r1.149.2.5 -r1.149.2.6
--- script.cpp	13 Aug 2004 09:08:26 -0000	1.149.2.5
+++ script.cpp	1 Sep 2004 08:00:14 -0000	1.149.2.6
@@ -381,7 +381,9 @@
 
 	case WIO_FLOBJECT:						/* flobject script */
 		idx = getObjectIndex(ss->number);
-		_scriptOrgPointer = getResourceAddress(rtFlObject, _objs[idx].fl_object_index);
+		assert(idx != -1);
+		idx = _objs[idx].fl_object_index;
+		_scriptOrgPointer = getResourceAddress(rtFlObject, idx);
 		assert(idx < _numFlObject);
 		_lastCodePtr = &_baseFLObject[idx];
 		break;