[Scummvm-cvs-logs] scummvm master -> f4f56fafea62b466e5edb30dd1141ea2bd4cb6c8

dreammaster dreammaster at scummvm.org
Fri Nov 15 04:01:43 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:
f4f56fafea TSAGE: Full height bugfix for R2R balloon landing scene


Commit: f4f56fafea62b466e5edb30dd1141ea2bd4cb6c8
    https://github.com/scummvm/scummvm/commit/f4f56fafea62b466e5edb30dd1141ea2bd4cb6c8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-11-14T19:01:06-08:00

Commit Message:
TSAGE: Full height bugfix for R2R balloon landing scene

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes2.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes2.cpp b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
index 7785fe6..70e6ff8 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes2.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes2.cpp
@@ -2995,6 +2995,8 @@ void Scene2600::postInit(SceneObjectList *OwnerList) {
 	loadScene(2600);
 	R2_GLOBALS._uiElements._active = false;
 	SceneExt::postInit();
+	R2_GLOBALS._interfaceY = SCREEN_HEIGHT;
+
 	R2_GLOBALS._sound1.fadeSound(214);
 	R2_GLOBALS._sound2.play(215);
 	_rotation = R2_GLOBALS._scenePalette.addRotation(176, 191, 1);
@@ -3009,6 +3011,7 @@ void Scene2600::postInit(SceneObjectList *OwnerList) {
 void Scene2600::remove() {
 	R2_GLOBALS._sound1.fadeOut2(NULL);
 	R2_GLOBALS._sound2.fadeOut2(NULL);
+	R2_GLOBALS._uiElements._visible = true;
 //	_rotation->remove();
 	SceneExt::remove();
 }






More information about the Scummvm-git-logs mailing list