[Scummvm-git-logs] scummvm master -> 53aa641f4480cac42e79b2a087d2c6e5d03168d0
dreammaster
dreammaster at scummvm.org
Sat Mar 3 02:29:02 CET 2018
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:
53aa641f44 XEEN: Hook up Clouds of Xeen intro for playing on startup
Commit: 53aa641f4480cac42e79b2a087d2c6e5d03168d0
https://github.com/scummvm/scummvm/commit/53aa641f4480cac42e79b2a087d2c6e5d03168d0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-02T20:28:57-05:00
Commit Message:
XEEN: Hook up Clouds of Xeen intro for playing on startup
Changed paths:
engines/xeen/worldofxeen/clouds_cutscenes.cpp
engines/xeen/worldofxeen/clouds_cutscenes.h
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.cpp b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
index c582864..fb1440e 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.cpp
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.cpp
@@ -33,6 +33,23 @@ namespace WorldOfXeen {
if (++cloudsCtr > 20) \
cloudsCtr = 1
+bool CloudsCutscenes::showCloudsIntro() {
+ FileManager &files = *g_vm->_files;
+ Screen &screen = *g_vm->_screen;
+ Sound &sound = *g_vm->_sound;
+
+ files._isDarkCc = false;
+ files.setGameCc(0);
+
+ bool seenIntro = showCloudsTitle() && showCloudsIntroInner();
+
+ sound.stopAllAudio();
+ sound.setMusicVolume(100);
+ screen.freePages();
+
+ return seenIntro;
+}
+
bool CloudsCutscenes::showCloudsTitle() {
EventsManager &events = *_vm->_events;
Screen &screen = *_vm->_screen;
@@ -90,7 +107,7 @@ bool CloudsCutscenes::showCloudsTitle() {
return true;
}
-bool CloudsCutscenes::showCloudsIntro() {
+bool CloudsCutscenes::showCloudsIntroInner() {
EventsManager &events = *_vm->_events;
Screen &screen = *_vm->_screen;
Sound &sound = *_vm->_sound;
diff --git a/engines/xeen/worldofxeen/clouds_cutscenes.h b/engines/xeen/worldofxeen/clouds_cutscenes.h
index fa7e35d..afaf3be 100644
--- a/engines/xeen/worldofxeen/clouds_cutscenes.h
+++ b/engines/xeen/worldofxeen/clouds_cutscenes.h
@@ -44,6 +44,16 @@ private:
void loadScreen(const Common::String &name);
/**
+ * Shows the Clouds of Xeen title screen
+ */
+ bool showCloudsTitle();
+
+ /**
+ * Inner implementation of the the Clouds of Xeen intro sequence
+ */
+ bool showCloudsIntroInner();
+
+ /**
* Shows part 1 of the Clouds of Xeen ending, with the castle being destroyed
*/
bool showCloudsEnding1();
@@ -72,11 +82,6 @@ public:
CloudsCutscenes(XeenEngine *vm) : Cutscenes(vm) {}
/**
- * Shows the Clouds of Xeen title screen
- */
- bool showCloudsTitle();
-
- /**
* Shows the Clouds of Xeen intro sequence
*/
bool showCloudsIntro();
More information about the Scummvm-git-logs
mailing list