[Scummvm-cvs-logs] scummvm master -> 760e8d4e6e215a760145608ed051341b65929004

eriktorbjorn eriktorbjorn at telia.com
Mon May 16 07:13:48 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:
760e8d4e6e TSAGE: Fix bad palette in the Fleeing planet cutscene


Commit: 760e8d4e6e215a760145608ed051341b65929004
    https://github.com/scummvm/scummvm/commit/760e8d4e6e215a760145608ed051341b65929004
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-05-15T22:07:17-07:00

Commit Message:
TSAGE: Fix bad palette in the Fleeing planet cutscene

It was using out-of-bounds data to manipulate the palette, and a
missing break caused it to change palette again immediately. Still,
even after this change I had the impression that the temporary
palette was visible for a bit longer in DOSBox. Could be my
imagination, though.

Changed paths:
    engines/tsage/ringworld_scenes2.cpp



diff --git a/engines/tsage/ringworld_scenes2.cpp b/engines/tsage/ringworld_scenes2.cpp
index 906f648..4378eac 100644
--- a/engines/tsage/ringworld_scenes2.cpp
+++ b/engines/tsage/ringworld_scenes2.cpp
@@ -477,13 +477,14 @@ void Scene1001::Action1::signal() {
 	case 19: {
 		_globals->_soundHandler.startSound(91);
 		byte adjustData[4] = {0xff, 0xff, 0xff, 0};
-		_globals->_scenePalette.fade(adjustData, true, 0);
+		_globals->_scenePalette.fade(adjustData, false, 0);
 
 		scene->_object1._strip = 7;
 		scene->_object1._frame = 1;
 		scene->_object1.setPosition(Common::Point(314, 112));
 		scene->_object1.addMover(NULL);
 		setDelay(2);
+		break;
 	}
 	case 20:
 		_globals->_scenePalette.loadPalette(16);






More information about the Scummvm-git-logs mailing list