aboutsummaryrefslogtreecommitdiff
path: root/engines/tsage/core.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2013-08-18 20:42:13 -0400
committerPaul Gilbert2013-08-18 20:42:13 -0400
commitcc35c422cb8f152c393627cf3268ee6327c7eb15 (patch)
tree1e94e6154cf9cce6b392c38c398c2618af1bfa6a /engines/tsage/core.cpp
parentd531484350291f037c896c05fdaf691231ef3c04 (diff)
downloadscummvm-rg350-cc35c422cb8f152c393627cf3268ee6327c7eb15.tar.gz
scummvm-rg350-cc35c422cb8f152c393627cf3268ee6327c7eb15.tar.bz2
scummvm-rg350-cc35c422cb8f152c393627cf3268ee6327c7eb15.zip
TSAGE: Fixes for speaking to Seeker and donning suit in R2R landing bay
Diffstat (limited to 'engines/tsage/core.cpp')
-rw-r--r--engines/tsage/core.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index b5ec0edbaf..b632aa8e27 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2111,8 +2111,13 @@ int SceneObject::getFrameCount() {
void SceneObject::animEnded() {
_animateMode = ANIM_MODE_NONE;
- if (_endAction)
- _endAction->signal();
+ if (_endAction) {
+ Action *endAction = _endAction;
+ if (g_vm->getGameID() == GType_Ringworld2)
+ _endAction = NULL;
+
+ endAction->signal();
+ }
}
int SceneObject::changeFrame() {