[Scummvm-git-logs] scummvm master -> 7fd335da12117d43829c8b0e990d3385f1bbef44

dreammaster dreammaster at scummvm.org
Sun Sep 18 17:30:50 CEST 2016


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:
7fd335da12 XEEN: Fix fade out at end of Darkside Title sequence


Commit: 7fd335da12117d43829c8b0e990d3385f1bbef44
    https://github.com/scummvm/scummvm/commit/7fd335da12117d43829c8b0e990d3385f1bbef44
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-18T11:30:41-04:00

Commit Message:
XEEN: Fix fade out at end of Darkside Title sequence

Changed paths:
    engines/xeen/screen.cpp
    engines/xeen/worldofxeen/darkside_cutscenes.cpp



diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp
index 03b751a..59978cf 100644
--- a/engines/xeen/screen.cpp
+++ b/engines/xeen/screen.cpp
@@ -438,6 +438,8 @@ void Screen::fadeInner(int step) {
 
 		_vm->_events->pollEventsAndWait();
 	}
+
+	update();
 }
 
 void Screen::updatePalette() {
diff --git a/engines/xeen/worldofxeen/darkside_cutscenes.cpp b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
index 68e3913..a30f354 100644
--- a/engines/xeen/worldofxeen/darkside_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/darkside_cutscenes.cpp
@@ -124,8 +124,8 @@ bool DarkSideCutscenes::showDarkSideTitle() {
 
 	sound.setMusicVolume(95);
 
-	screen.loadBackground("jvc.raw");
 	screen.fadeOut(8);
+	screen.loadBackground("jvc.raw");
 	screen.draw();
 	screen.fadeIn(4);
 	
@@ -236,7 +236,7 @@ bool DarkSideCutscenes::showDarkSideIntro() {
 bool DarkSideCutscenes::showDarkSideEnding() {
 	EventsManager &events = *_vm->_events;
 	Screen &screen = *_vm->_screen;
-	Sound &sound = *_vm->_sound;
+//	Sound &sound = *_vm->_sound;
 
 	//Voc voc("ido2.voc");
 	//	Music newBright("newbrigh.m");





More information about the Scummvm-git-logs mailing list