[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.141,1.142

Eugene Sandulenko sev at users.sourceforge.net
Mon Jun 13 17:34:36 CEST 2005


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

Modified Files:
	actor.cpp 
Log Message:
Fix dock bug


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- actor.cpp	12 Jun 2005 21:21:14 -0000	1.141
+++ actor.cpp	14 Jun 2005 00:31:54 -0000	1.142
@@ -603,6 +603,10 @@
 	assert(_protagonist);
 	
 	if ((actorsEntrance >= 0) && (_vm->_scene->_entryList.entryListCount > 0)) {
+		if (_vm->_scene->_entryList.entryListCount <= actorsEntrance) {
+			actorsEntrance = 0; //OCEAN bug
+		}
+
 		sceneEntry = _vm->_scene->_entryList.getEntry(actorsEntrance);
 		if (_vm->_scene->getFlags() & kSceneFlagISO) {
 			_protagonist->location = sceneEntry->location;





More information about the Scummvm-git-logs mailing list