[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.190,1.191

[Max Horn]

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

Modified Files:
	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.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- script.cpp	1 Sep 2004 02:41:48 -0000	1.190
+++ script.cpp	1 Sep 2004 07:59:30 -0000	1.191
@@ -407,8 +407,10 @@
 
 	case WIO_FLOBJECT:						/* flobject script */
 		idx = getObjectIndex(ss->number);
-		_scriptOrgPointer = getResourceAddress(rtFlObject, _objs[idx].fl_object_index);
-		assert(_objs[idx].fl_object_index < _numFlObject);
+		assert(idx != -1);
+		idx = _objs[idx].fl_object_index;
+		_scriptOrgPointer = getResourceAddress(rtFlObject, idx);
+		assert(idx < _numFlObject);
 		_lastCodePtr = &_baseFLObject[idx];
 		break;
 	default: