aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2013-08-27 20:06:44 -0400
committerPaul Gilbert2013-08-27 20:06:44 -0400
commit8823edf1041394635adfabcb2090b75c725d0d2f (patch)
tree295ec1677fe40cf425b65a658377e2527000fcc1 /engines
parenta52cb80ae002fe7a9fc4e4db8e69c0b1c06bd2c1 (diff)
downloadscummvm-rg350-8823edf1041394635adfabcb2090b75c725d0d2f.tar.gz
scummvm-rg350-8823edf1041394635adfabcb2090b75c725d0d2f.tar.bz2
scummvm-rg350-8823edf1041394635adfabcb2090b75c725d0d2f.zip
TSAGE: Fix for R2R scene change crash getting into intact spaceship
Diffstat (limited to 'engines')
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 4ecb33e307..f5621ea656 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -9910,7 +9910,7 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
_actor5.setPosition(Common::Point(291, 147));
_actor5.fixPriority(100);
_actor5.setDetails(1550, 81, -1, -1, 1, (SceneItem *) NULL);
-
+
if (R2_INVENTORY.getObjectScene(R2_THRUSTER_VALVE) == 1580) {
_actor6.postInit();
_actor6.setup(1580, 6, 2);
@@ -9928,11 +9928,9 @@ void Scene1580::postInit(SceneObjectList *OwnerList) {
}
R2_GLOBALS._player.postInit();
- R2_GLOBALS._player._oldCharacterScene[R2_GLOBALS._player._characterIndex] = 1580;
R2_GLOBALS._player.hide();
setAction(&_sequenceManager, this, 1, &R2_GLOBALS._player, NULL);
_item3.setDetails(Rect(0, 0, 320, 200), 1550, 50, -1, -1, 1, NULL);
-
}
void Scene1580::signal() {