[Scummvm-cvs-logs] scummvm master -> 441632de7018d4fc8b9043d66ff3caeb5f76da1e
dreammaster
dreammaster at scummvm.org
Fri Nov 15 04:40:39 CET 2013
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:
441632de70 TSAGE: Fix for Quinn's visage in R2R forest campfire sequence
Commit: 441632de7018d4fc8b9043d66ff3caeb5f76da1e
https://github.com/scummvm/scummvm/commit/441632de7018d4fc8b9043d66ff3caeb5f76da1e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-14T19:39:53-08:00
Commit Message:
TSAGE: Fix for Quinn's visage in R2R forest campfire sequence
Changed paths:
engines/tsage/ringworld2/ringworld2_scenes2.cpp
engines/tsage/ringworld2/ringworld2_speakers.cpp
diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 70e6ff8..7bc2b1d 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -3965,7 +3965,8 @@ void Scene2750::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.setStrip(6);
R2_GLOBALS._player.animate(ANIM_MODE_NONE, NULL);
R2_GLOBALS._player.setPosition(Common::Point(81, 165));
- R2_GLOBALS._events.setCursor(CURSOR_WALK);
+
+ R2_GLOBALS._events.setCursor(CURSOR_ARROW);
_stripNumber = 1204;
_sceneMode = 11;
_stripManager.start(_stripNumber, this);
@@ -3985,6 +3986,7 @@ void Scene2750::postInit(SceneObjectList *OwnerList) {
R2_GLOBALS._player.enableControl();
}
}
+
void Scene2750::signal() {
switch (_sceneMode) {
case 10:
diff --git a/engines/tsage/ringworld2/ringworld2_speakers.cpp b/engines/tsage/ringworld2/ringworld2_speakers.cpp
index 61a4840..675511a 100644
--- a/engines/tsage/ringworld2/ringworld2_speakers.cpp
+++ b/engines/tsage/ringworld2/ringworld2_speakers.cpp
@@ -1441,7 +1441,7 @@ void SpeakerQuinn2750::animateSpeaker() {
_object1.setup(4022, 5, 1);
break;
case 2752:
- _object1.setup(2752, 1, 1);
+ _object1.setup(2752, 3, 1);
break;
default:
break;
More information about the Scummvm-git-logs
mailing list