[Scummvm-cvs-logs] scummvm master -> 3201bb46bdfb0742b7a5464d59aaa672e1a5f022

Strangerke arnaud.boutonne at gmail.com
Tue May 3 08:41:54 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:
3201bb46bd TSAGE: Fix the last action of the game. The ending animation is still screwed due to palette issues


Commit: 3201bb46bdfb0742b7a5464d59aaa672e1a5f022
    https://github.com/scummvm/scummvm/commit/3201bb46bdfb0742b7a5464d59aaa672e1a5f022
Author: strangerke (arnaud.boutonne at gmail.com)
Date: 2011-05-02T23:40:28-07:00

Commit Message:
TSAGE: Fix the last action of the game. The ending animation is still screwed due to palette issues

Changed paths:
    engines/tsage/ringworld_scenes10.cpp



diff --git a/engines/tsage/ringworld_scenes10.cpp b/engines/tsage/ringworld_scenes10.cpp
index 26b6d56..8a45ff7 100644
--- a/engines/tsage/ringworld_scenes10.cpp
+++ b/engines/tsage/ringworld_scenes10.cpp
@@ -1652,6 +1652,7 @@ void Scene9900::strAction1::signal() {
 		_object9.setVisage(18);
 		_object9._frame = 1;
 		_object9._strip = 6;
+		_object9.fixPriority(250);
 		_object9.setPosition(Common::Point(171, 59));
 		_object9.animate(ANIM_MODE_5, 0);
 		_globals->_scenePalette.addRotation(67, 111, 1, 1, this);
@@ -1938,7 +1939,7 @@ void Scene9900::process(Event &event) {
 	if (event.handled)
 		return;
 	Scene::process(event);
-	if (_sceneMode != 9906) {
+	if (_sceneMode == 9906) {
 		if ((event.eventType == EVENT_BUTTON_DOWN) && (_globals->_events.getCursor() == OBJECT_ITEMS)) {
 			_object8._state = 1;
 			RING_INVENTORY._items._sceneNumber = 9900;






More information about the Scummvm-git-logs mailing list