[Scummvm-git-logs] scummvm master -> 4576f1f087bd1c4f8d2060c435b6a8f96302c4f1

[alxpnv]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
32ec986518 ASYLUM: fix vertical alignment for movie subtitles
4576f1f087 ASYLUM: fix loading screen too dark


Commit: 32ec986518c2cfd925ae8da252917e166ba2a813
    https://github.com/scummvm/scummvm/commit/32ec986518c2cfd925ae8da252917e166ba2a813
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-15T15:35:22+03:00

Commit Message:
ASYLUM: fix vertical alignment for movie subtitles

Bug reported by Attx

Changed paths:
    engines/asylum/views/video.cpp


diff --git a/engines/asylum/views/video.cpp b/engines/asylum/views/video.cpp
index 6d96c13b57..893ae44378 100644
--- a/engines/asylum/views/video.cpp
+++ b/engines/asylum/views/video.cpp
@@ -101,13 +101,12 @@ bool VideoPlayer::handleEvent(const AsylumEvent &evt) {
 			getScreen()->fillRect(0, 400, 640, 80, 0);
 
 			if (_subtitleIndex >= 0) {
-				char *text1 = getText()->get((ResourceId)_currentMovie);
+				char *text = getText()->get(_subtitles[_subtitleIndex].resourceId);
 
-				int16 y = (int16)(10 * (44 - getText()->draw(0, 99, kTextCalculate, Common::Point(10, 400), 20, 620, text1)));
+				int16 y = (int16)(10 * (44 - getText()->draw(0, 99, kTextCalculate, Common::Point(10, 400), 20, 620, text)));
 				if (y <= 400)
 					y = 405;
 
-				char *text = getText()->get(_subtitles[_subtitleIndex].resourceId);
 				getText()->draw(0, 99, kTextCenter, Common::Point(10, y), 20, 620, text);
 
 				if (_vm->checkGameVersion("Steam")) {


Commit: 4576f1f087bd1c4f8d2060c435b6a8f96302c4f1
    https://github.com/scummvm/scummvm/commit/4576f1f087bd1c4f8d2060c435b6a8f96302c4f1
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-15T15:35:22+03:00

Commit Message:
ASYLUM: fix loading screen too dark

Also added a missing fade-in

Reported by Attx

Changed paths:
    engines/asylum/views/scene.cpp
    engines/asylum/views/scenetitle.cpp


diff --git a/engines/asylum/views/scene.cpp b/engines/asylum/views/scene.cpp
index 24d9b3102c..d67e0fa2ca 100644
--- a/engines/asylum/views/scene.cpp
+++ b/engines/asylum/views/scene.cpp
@@ -2379,21 +2379,18 @@ void Scene::preload() {
 		return;
 
 	SceneTitle *title = new SceneTitle(_vm);
-	title->load();
 	getCursor()->hide();
+	title->load();
 
 	do {
 		title->update(_vm->getTick());
 
-		getScreen()->copyBackBufferToScreen();
 		g_system->updateScreen();
-
 		g_system->delayMillis(10);
 
 		// Poll events (this ensure we don't freeze the screen)
 		Common::Event ev;
 		_vm->getEventManager()->pollEvent(ev);
-
 	} while (!title->loadingComplete());
 
 	delete title;
diff --git a/engines/asylum/views/scenetitle.cpp b/engines/asylum/views/scenetitle.cpp
index c1126c5d61..69ce0287eb 100644
--- a/engines/asylum/views/scenetitle.cpp
+++ b/engines/asylum/views/scenetitle.cpp
@@ -56,6 +56,7 @@ void SceneTitle::load() {
 	_done = false;
 
 	update(_start);
+	getScreen()->stopPaletteFadeAndSet(getWorld()->sceneTitlePaletteResourceId, 5, 50);
 }
 
 void SceneTitle::update(int32 tick) {
@@ -65,6 +66,7 @@ void SceneTitle::update(int32 tick) {
 	getScreen()->draw(getWorld()->sceneTitleGraphicResourceId);
 	getScreen()->draw(MAKE_RESOURCE(kResourcePackSound, 17), _spinnerFrameIndex, Common::Point((int16)(((_spinnerProgress / 590.0) * 580.0) - 290), 0), kDrawFlagNone, false);
 	getText()->drawCentered(Common::Point(320, 30), 24, MAKE_RESOURCE(kResourcePackText, getWorld()->chapter + 1811));
+	getScreen()->copyBackBufferToScreen();
 
 	// This is not from the original. It's just some arbitrary math to throttle the progress indicator.
 	//