aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--saga/actor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp
index bd0d2ea30a..f0af7df1be 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -603,6 +603,10 @@ void Actor::updateActorsScene(int actorsEntrance) {
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;