[Scummvm-cvs-logs] scummvm master -> 9eb99792f8b81ec3fc17702701e2981d0b86ac60
dreammaster
dreammaster at scummvm.org
Thu Jul 10 03:48:33 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9eb99792f8 TSAGE: Fix for R2R endgame crash when active character is Seeker
Commit: 9eb99792f8b81ec3fc17702701e2981d0b86ac60
https://github.com/scummvm/scummvm/commit/9eb99792f8b81ec3fc17702701e2981d0b86ac60
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-07-09T21:43:33-04:00
Commit Message:
TSAGE: Fix for R2R endgame crash when active character is Seeker
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes3.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 0898cfd..9eaead6 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -2843,8 +2843,8 @@ void Scene3400::signal() {
R2_INVENTORY.setObjectScene(R2_SAPPHIRE_BLUE, 0);
_stripManager.start(3307, this);
if (R2_GLOBALS._player._characterIndex == R2_SEEKER) {
- _sceneMode = 3400;
- R2_GLOBALS._player.setAction(&_sequenceManager, this, 3400, &R2_GLOBALS._player, &_teal, &_sapphire, NULL);
+ _sceneMode = 3404;
+ R2_GLOBALS._player.setAction(&_sequenceManager, this, 3404, &R2_GLOBALS._player, &_teal, &_sapphire, NULL);
} else {
_sceneMode = 3408;
_companion1.setAction(&_sequenceManager, this, 3408, &_companion1, &_teal, &_sapphire, NULL);
More information about the Scummvm-git-logs
mailing list