ENGINES: Hook up video playing again

xoreos · Jan 29, 2014 · 41a5dfc · 41a5dfc
1 parent bd83f4d
commit 41a5dfc
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 26 deletions.
diff --git a/src/engines/dragonage/dragonage.cpp b/src/engines/dragonage/dragonage.cpp
@@ -101,14 +101,16 @@ void DragonAgeEngine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	/*
+	CursorMan.hideCursor();
+
 	playVideo("dragon_age_ea_logo");
 	playVideo("dragon_age_main");
-	if (EventMan.quitRequested())
-		return;
-	*/
 
 	CursorMan.set();
+	CursorMan.showCursor();
+
+	if (EventMan.quitRequested())
+		return;
 
 	while (!EventMan.quitRequested()) {
 		EventMan.delay(10);

diff --git a/src/engines/dragonage2/dragonage2.cpp b/src/engines/dragonage2/dragonage2.cpp
@@ -101,13 +101,15 @@ void DragonAge2Engine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	/*
+	CursorMan.hideCursor();
+
 	playVideo("dragon_age_ea_logo");
-	if (EventMan.quitRequested())
-		return;
-	*/
 
 	CursorMan.set();
+	CursorMan.showCursor();
+
+	if (EventMan.quitRequested())
+		return;
 
 	while (!EventMan.quitRequested()) {
 		EventMan.delay(10);

diff --git a/src/engines/jade/jade.cpp b/src/engines/jade/jade.cpp
@@ -102,17 +102,19 @@ void JadeEngine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	/*
+	CursorMan.hideCursor();
+
 	playVideo("black");
 	playVideo("publisher");
 	playVideo("bwlogo");
 	playVideo("graymatr");
 	playVideo("attract");
-	if (EventMan.quitRequested())
-		return;
-	*/
 
 	CursorMan.set();
+	CursorMan.showCursor();
+
+	if (EventMan.quitRequested())
+		return;
 
 	playSound("musicbank00046", Sound::kSoundTypeMusic, true);
 

diff --git a/src/engines/kotor/kotor.cpp b/src/engines/kotor/kotor.cpp
@@ -132,11 +132,13 @@ void KotOREngine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	// playIntroVideos();
-	if (EventMan.quitRequested())
-		return;
+	CursorMan.hideCursor();
+	playIntroVideos();
 
 	CursorMan.set();
+	CursorMan.showCursor();
+	if (EventMan.quitRequested())
+		return;
 
 	playMenuMusic();
 

diff --git a/src/engines/kotor2/kotor2.cpp b/src/engines/kotor2/kotor2.cpp
@@ -117,11 +117,13 @@ void KotOR2Engine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	// playIntroVideos();
-	if (EventMan.quitRequested())
-		return;
+	CursorMan.hideCursor();
+	playIntroVideos();
 
 	CursorMan.set();
+	CursorMan.showCursor();
+	if (EventMan.quitRequested())
+		return;
 
 	playMenuMusic();
 

diff --git a/src/engines/nwn/nwn.cpp b/src/engines/nwn/nwn.cpp
@@ -119,7 +119,13 @@ void NWNEngine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
+	CursorMan.hideCursor();
+	playIntroVideos();
+
 	CursorMan.set();
+	CursorMan.showCursor();
+	if (EventMan.quitRequested())
+		return;
 
 	playMenuMusic();
 

diff --git a/src/engines/nwn2/nwn2.cpp b/src/engines/nwn2/nwn2.cpp
@@ -104,19 +104,20 @@ void NWN2Engine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	/*
+	CursorMan.hideCursor();
+
 	playVideo("atarilogo");
 	playVideo("oeilogo");
 	playVideo("wotclogo");
 	playVideo("nvidialogo");
 	playVideo("legal");
 	playVideo("intro");
 
+	CursorMan.set();
+	CursorMan.showCursor();
+
 	if (EventMan.quitRequested())
 		return;
-	*/
-
-	CursorMan.set();
 
 	Sound::ChannelHandle channel;
 

diff --git a/src/engines/thewitcher/thewitcher.cpp b/src/engines/thewitcher/thewitcher.cpp
@@ -110,17 +110,19 @@ void TheWitcherEngine::run(const Common::UString &target) {
 
 	status("Successfully initialized the engine");
 
-	/*
+	CursorMan.hideCursor();
+
 	playVideo("publisher");
 	playVideo("developer");
 	playVideo("engine");
 	playVideo("intro");
 	playVideo("title");
-	if (EventMan.quitRequested())
-		return;
-	*/
 
 	CursorMan.set();
+	CursorMan.showCursor();
+
+	if (EventMan.quitRequested())
+		return;
 
 	playSound("m1_axem00020005", Sound::kSoundTypeVoice);