[Scummvm-cvs-logs] scummvm master -> aa78f068986a1db7cbffd1fd563fe1d8e16eb24e
Strangerke
arnaud.boutonne at gmail.com
Mon May 30 01:18:17 CEST 2011
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:
aa78f06898 TSAGE: Fix a mess in Seeker's actions in scene 2100
Commit: aa78f068986a1db7cbffd1fd563fe1d8e16eb24e
https://github.com/scummvm/scummvm/commit/aa78f068986a1db7cbffd1fd563fe1d8e16eb24e
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-29T16:17:12-07:00
Commit Message:
TSAGE: Fix a mess in Seeker's actions in scene 2100
Changed paths:
engines/tsage/ringworld_scenes3.cpp
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index 60d3526..5de9efa 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -1475,24 +1475,23 @@ void Scene2100::Object2::doAction(int action) {
case CURSOR_TALK:
if (_globals->getFlag(72)) {
_globals->_player.disableControl();
- if (!_globals->getFlag(52))
+ if (!_globals->getFlag(52)) {
+ scene->_sceneMode = 2111;
scene->setAction(&scene->_sequenceManager, scene, 2111, NULL);
- else {
+ } else {
scene->_sceneMode = _globals->getFlag(53) ? 2112 : 2110;
scene->setAction(&scene->_sequenceManager, scene, scene->_sceneMode, NULL);
}
- } else {
- if (_globals->getFlag(14))
+ } else if (_globals->getFlag(13)) {
+ SceneItem::display2(2100, 31);
+ } else if (_globals->getFlag(14)) {
SceneItem::display2(2100, 32);
- else {
+ } else {
_globals->setFlag(14);
_globals->_player.disableControl();
scene->_sceneMode = 2108;
scene->setAction(&scene->_sequenceManager, scene, 2109, NULL);
- }
}
-
- scene->setAction(&scene->_action4);
break;
default:
SceneHotspot::doAction(action);
More information about the Scummvm-git-logs
mailing list