[Scummvm-cvs-logs] scummvm master -> 402fc4f950eb203e3c195b1cac7d0dcdabe10639
Strangerke
arnaud.boutonne at gmail.com
Sat May 28 16:36:22 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:
402fc4f950 TSAGE: Fix an animation issue, and the transition between scene 5300 and 5100 (Seeker waking up and leaving)
Commit: 402fc4f950eb203e3c195b1cac7d0dcdabe10639
https://github.com/scummvm/scummvm/commit/402fc4f950eb203e3c195b1cac7d0dcdabe10639
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-28T07:35:08-07:00
Commit Message:
TSAGE: Fix an animation issue, and the transition between scene 5300 and 5100 (Seeker waking up and leaving)
Changed paths:
engines/tsage/ringworld_scenes6.cpp
diff --git a/engines/tsage/ringworld_scenes6.cpp b/engines/tsage/ringworld_scenes6.cpp
index bab9b16..1a84871 100644
--- a/engines/tsage/ringworld_scenes6.cpp
+++ b/engines/tsage/ringworld_scenes6.cpp
@@ -1744,6 +1744,7 @@ void Scene5200::dispatch() {
*--------------------------------------------------------------------------*/
void Scene5300::Action1::signal() {
+ // Seeker waking up
Scene5300 *scene = (Scene5300 *)_globals->_sceneManager._scene;
switch (_actionIndex++) {
@@ -1777,7 +1778,8 @@ void Scene5300::Action1::signal() {
_globals->_player.enableControl();
remove();
} else {
- _globals->getFlag(60);
+ _globals->setFlag(60);
+ scene->_hotspot2._numFrames = 10;
if (_globals->getFlag(67)) {
scene->_sceneMode = 5310;
@@ -1855,8 +1857,8 @@ void Scene5300::Hotspot1::doAction(int action) {
break;
}
}
-
void Scene5300::Hotspot2::doAction(int action) {
+ // Seeker
Scene5300 *scene = (Scene5300 *)_globals->_sceneManager._scene;
switch (action) {
@@ -1930,6 +1932,7 @@ void Scene5300::Hotspot2::doAction(int action) {
}
void Scene5300::Hotspot5::doAction(int action) {
+ // Sharp bone
Scene5300 *scene = (Scene5300 *)_globals->_sceneManager._scene;
switch (action) {
More information about the Scummvm-git-logs
mailing list