[Scummvm-git-logs] scummvm master -> a6da9e490600d947e508c4d20a44bad8c96f502f

[dreammaster]

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:
ab010dc09d MM: MM1: Allow Select action to start title slideshow
a6da9e4906 MM: MM1: Fix showing character list from main menu


Commit: ab010dc09dffc70efb2d1b9ebfa9a3975dcf14aa
    https://github.com/scummvm/scummvm/commit/ab010dc09dffc70efb2d1b9ebfa9a3975dcf14aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-08T20:20:04-08:00

Commit Message:
MM: MM1: Allow Select action to start title slideshow

Changed paths:
    engines/mm/mm1/views/title.cpp
    engines/mm/mm1/views/title.h


diff --git a/engines/mm/mm1/views/title.cpp b/engines/mm/mm1/views/title.cpp
index 1acf177f921..e494edba822 100644
--- a/engines/mm/mm1/views/title.cpp
+++ b/engines/mm/mm1/views/title.cpp
@@ -130,13 +130,8 @@ void Title::timeout() {
 }
 
 bool Title::msgKeypress(const KeypressMessage &msg) {
-	if (msg.keycode == Common::KEYCODE_SPACE) {
-		// Start showing game screens slideshow
-		cancelDelay();
-		_screenNum = 2;
-		_fadeIndex = 0;
-		redraw();
-	}
+	if (msg.keycode == Common::KEYCODE_SPACE)
+		startSlideshow();
 
 	return true;
 }
@@ -145,11 +140,21 @@ bool Title::msgAction(const ActionMessage &msg) {
 	if (msg._action == KEYBIND_ESCAPE) {
 		g_events->replaceView("AreYouReady");
 		return true;
+	} else if (msg._action == KEYBIND_SELECT) {
+		startSlideshow();
+		return true;
 	}
 
 	return false;
 }
 
+void Title::startSlideshow() {
+	cancelDelay();
+	_screenNum = 2;
+	_fadeIndex = 0;
+	redraw();
+}
+
 } // namespace Views
 } // namespace MM1
 } // namespace MM
diff --git a/engines/mm/mm1/views/title.h b/engines/mm/mm1/views/title.h
index 0b1d61ba340..062c4003a8f 100644
--- a/engines/mm/mm1/views/title.h
+++ b/engines/mm/mm1/views/title.h
@@ -35,6 +35,11 @@ private:
 	Graphics::ManagedSurface _screens[SCREENS_COUNT];
 	int _screenNum = -1;
 	int _fadeIndex = 0;
+
+	/**
+	 * Starts the slideshow of game scenes
+	 */
+	void startSlideshow();
 public:
 	Title();
 	virtual ~Title() {}


Commit: a6da9e490600d947e508c4d20a44bad8c96f502f
    https://github.com/scummvm/scummvm/commit/a6da9e490600d947e508c4d20a44bad8c96f502f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-08T21:12:12-08:00

Commit Message:
MM: MM1: Fix showing character list from main menu

Changed paths:
    engines/mm/mm1/views/dialogs.h
    engines/mm/mm1/views/main_menu.cpp
    engines/mm/mm1/views_enh/dialogs.h


diff --git a/engines/mm/mm1/views/dialogs.h b/engines/mm/mm1/views/dialogs.h
index ed11bdd8bdc..4558fb3e213 100644
--- a/engines/mm/mm1/views/dialogs.h
+++ b/engines/mm/mm1/views/dialogs.h
@@ -25,6 +25,7 @@
 #include "mm/mm1/events.h"
 #include "mm/mm1/views/are_you_ready.h"
 #include "mm/mm1/views/bash.h"
+#include "mm/mm1/views/characters.h"
 #include "mm/mm1/views/character_view_combat.h"
 #include "mm/mm1/views/combat.h"
 #include "mm/mm1/views/create_characters.h"
@@ -89,6 +90,7 @@ struct Dialogs {
 private:
 	Views::AreYouReady _areYouReady;
 	Views::Bash _bash;
+	Views::Characters _characters;
 	Views::CharacterViewCombat _characterViewCombat;
 	Views::Combat _combat;
 	Views::CreateCharacters _createCharacters;
diff --git a/engines/mm/mm1/views/main_menu.cpp b/engines/mm/mm1/views/main_menu.cpp
index 9ecb8617397..474acd24d8b 100644
--- a/engines/mm/mm1/views/main_menu.cpp
+++ b/engines/mm/mm1/views/main_menu.cpp
@@ -48,7 +48,7 @@ bool MainMenu::msgKeypress(const KeypressMessage &msg) {
 		break;
 
 	case Common::KEYCODE_v:
-		addView("ViewCharacters");
+		addView("Characters");
 		break;
 
 	case Common::KEYCODE_1:
diff --git a/engines/mm/mm1/views_enh/dialogs.h b/engines/mm/mm1/views_enh/dialogs.h
index 94c8395ccd7..62cbf53dbdb 100644
--- a/engines/mm/mm1/views_enh/dialogs.h
+++ b/engines/mm/mm1/views_enh/dialogs.h
@@ -48,12 +48,12 @@ private:
 
 	// Unenhanced views
 	Views::AreYouReady _areYouReady;
+	Views::Characters _characters;
 	Views::CreateCharacters _createCharacters;
 	Views::Locations::Inn _inn;
 	Views::MainMenu _mainMenu;
 	Views::Protect _protect;
 	Views::Title _title;
-//	Views::ViewCharacters _viewCharacters;
 //	Views::ViewCharacter _viewCharacter;
 	ViewsEnh::MapPopup _mapPopup;
 	ViewsEnh::QuickRef _quickRef;