MM: MM1: Add Clouds title music to Enhanced title screen

Author: dreammaster

engines/mm/mm1/views_enh/dialogs.h

@@ -24,7 +24,6 @@
 
 #include "mm/mm1/events.h"
 #include "mm/mm1/views/bash.h"
-#include "mm/mm1/views/title.h"
 #include "mm/mm1/views_enh/character_info.h"
 #include "mm/mm1/views_enh/character_inventory.h"
 #include "mm/mm1/views_enh/character_select.h"
@@ -44,6 +43,7 @@
 #include "mm/mm1/views_enh/quick_ref.h"
 #include "mm/mm1/views_enh/rest.h"
 #include "mm/mm1/views_enh/search.h"
+#include "mm/mm1/views_enh/title.h"
 #include "mm/mm1/views_enh/trade.h"
 #include "mm/mm1/views_enh/trap.h"
 #include "mm/mm1/views_enh/unlock.h"
@@ -155,6 +155,7 @@ struct Dialogs {
 	ViewsEnh::QuickRef _quickRef;
 	ViewsEnh::Rest _rest;
 	ViewsEnh::Search _search;
+	ViewsEnh::Title _title;
 	ViewsEnh::Trade _trade;
 	ViewsEnh::Trap _trap;
 	ViewsEnh::Unlock _unlock;
@@ -164,7 +165,6 @@ struct Dialogs {
 	ViewsEnh::WhoWillTry _whoWillTry;
 	ViewsEnh::WonGame _wonGame;
 	Views::Bash _bash;
-	Views::Title _title;
 public:
 	Dialogs() {}
 };

engines/mm/mm1/views_enh/title.cpp

@@ -0,0 +1,42 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "mm/mm1/views_enh/title.h"
+#include "mm/mm1/mm1.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+
+bool Title::msgFocus(const FocusMessage &msg) {
+	Views::Title::msgFocus(msg);
+	g_engine->_sound->playSong("inn.m");
+	return true;
+}
+
+bool Title::msgUnfocus(const UnfocusMessage &msg) {
+	g_engine->_sound->stopSong();
+	return Views::Title::msgUnfocus(msg);
+}
+
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM

engines/mm/mm1/views_enh/title.h

@@ -0,0 +1,44 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MM1_VIEWS_ENH_TITLE_H
+#define MM1_VIEWS_ENH_TITLE_H
+
+#include "mm/mm1/views/title.h"
+
+namespace MM {
+namespace MM1 {
+namespace ViewsEnh {
+
+class Title : public Views::Title {
+public:
+	Title() : Views::Title() {}
+	virtual ~Title() {}
+
+	bool msgFocus(const FocusMessage &msg) override;
+	bool msgUnfocus(const UnfocusMessage &msg) override;
+};
+
+} // namespace ViewsEnh
+} // namespace MM1
+} // namespace MM
+
+#endif

engines/mm/module.mk

@@ -170,6 +170,7 @@ MODULE_OBJS += \
 	mm1/views_enh/select_number.o \
 	mm1/views_enh/text_entry.o \
 	mm1/views_enh/text_view.o \
+	mm1/views_enh/title.o \
 	mm1/views_enh/trade.o \
 	mm1/views_enh/trap.o \
 	mm1/views_enh/unlock.o \

engines/mm/shared/xeen/sound.cpp

@@ -25,6 +25,7 @@
 #include "common/config-manager.h"
 #include "mm/shared/xeen/sound.h"
 #include "mm/shared/xeen/sound_driver_adlib.h"
+#include "mm/xeen/xeen.h"
 #include "mm/mm.h"
 
 namespace MM {
@@ -215,12 +216,13 @@ void Sound::playSong(const Common::String &name, int param) {
 	Common::File mf;
 	if (mf.open(name)) {
 		playSong(mf);
-	} else {
 #ifdef ENABLE_XEEN
+	} else if (dynamic_cast<MM::Xeen::XeenEngine *>(g_engine)) {
 		File f(name, _musicSide);
-#else
-		File f(name);
+		playSong(f);
 #endif
+	} else {
+		File f(name);
 		playSong(f);
 	}
 }