[Scummvm-git-logs] scummvm master -> 0c64bb82fa75915b1a010cd17447df7bb46dcfd2

[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:
3d5fe05257 ASYLUM: don't play intro video when loading during startup
0c64bb82fa ASYLUM: speed up puzzle animations a little bit


Commit: 3d5fe05257d92331f4b142c553cbd3303822df45
    https://github.com/scummvm/scummvm/commit/3d5fe05257d92331f4b142c553cbd3303822df45
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-22T12:00:12+03:00

Commit Message:
ASYLUM: don't play intro video when loading during startup

Bug reported by Attx

Changed paths:
    engines/asylum/asylum.cpp
    engines/asylum/views/menu.cpp
    engines/asylum/views/menu.h


diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index d979300242..a2148226c5 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -160,6 +160,8 @@ Common::Error AsylumEngine::run() {
 
 		if (!noError)
 			_handler = _menu;
+		else
+			menu()->setLoadingDuringStartup();
 
 		// Load config
 		Config.read();
diff --git a/engines/asylum/views/menu.cpp b/engines/asylum/views/menu.cpp
index 3f3b29b758..c76b0f9d32 100644
--- a/engines/asylum/views/menu.cpp
+++ b/engines/asylum/views/menu.cpp
@@ -78,6 +78,7 @@ Menu::Menu(AsylumEngine *vm): _vm(vm) {
 
 	// Savegames
 	_prefixWidth = 0;
+	_loadingDuringStartup = false;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -355,7 +356,8 @@ bool Menu::init() {
 			_showMovie = true;
 
 			// Play start video
-			getVideo()->play(0, this);
+			if (!_loadingDuringStartup)
+				getVideo()->play(0, this);
 
 			// If no savegame is present, start the game directly
 			if (!getSaveLoad()->hasSavegames()) {
diff --git a/engines/asylum/views/menu.h b/engines/asylum/views/menu.h
index 0b7c487bca..4cb7329028 100644
--- a/engines/asylum/views/menu.h
+++ b/engines/asylum/views/menu.h
@@ -62,6 +62,7 @@ public:
 	// Savegames
 	void setDword455C78(bool state) { _dword_455C78 = state; }
 	void setDword455C80(bool state) { _dword_455C80 = state; }
+	void setLoadingDuringStartup()  { _loadingDuringStartup = true; }
 
 	bool isEditingSavegameName() { return _activeScreen == kMenuSaveGame && _isEditingSavegameName; };
 
@@ -127,6 +128,7 @@ private:
 	// Savegames
 	Common::String _previousName;
 	int32 _prefixWidth;
+	bool _loadingDuringStartup;
 
 	/**
 	 * Setups menu screen


Commit: 0c64bb82fa75915b1a010cd17447df7bb46dcfd2
    https://github.com/scummvm/scummvm/commit/0c64bb82fa75915b1a010cd17447df7bb46dcfd2
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-22T12:00:12+03:00

Commit Message:
ASYLUM: speed up puzzle animations a little bit

Suggested by Attx. Thanks!

Changed paths:
    engines/asylum/puzzles/puzzle.cpp


diff --git a/engines/asylum/puzzles/puzzle.cpp b/engines/asylum/puzzles/puzzle.cpp
index bf5ad06d0a..3eac15fdb6 100644
--- a/engines/asylum/puzzles/puzzle.cpp
+++ b/engines/asylum/puzzles/puzzle.cpp
@@ -98,7 +98,7 @@ bool Puzzle::update(const AsylumEvent &evt) {
 			getSharedData()->setEventUpdate(getSharedData()->getEventUpdate() ^ 1);
 
 			getSharedData()->setFlag(kFlagRedraw, false);
-			getSharedData()->setNextScreenUpdate(ticks + 55);
+			getSharedData()->setNextScreenUpdate(ticks + 40);
 		}
 	}