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

[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:
4f531856a4 MM: MM1: Minor tweak to column positioning in QuickRef
c1e5a933dc MM: MM1: Fix compilation when Xeen subengine is disabled


Commit: 4f531856a4d3cc7b48edb308f165efa368f0b401
    https://github.com/scummvm/scummvm/commit/4f531856a4d3cc7b48edb308f165efa368f0b401
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-09T07:58:10-08:00

Commit Message:
MM: MM1: Minor tweak to column positioning in QuickRef

Changed paths:
    engines/mm/mm1/views_enh/quick_ref.cpp


diff --git a/engines/mm/mm1/views_enh/quick_ref.cpp b/engines/mm/mm1/views_enh/quick_ref.cpp
index 0ad469a2c75..72ff404150a 100644
--- a/engines/mm/mm1/views_enh/quick_ref.cpp
+++ b/engines/mm/mm1/views_enh/quick_ref.cpp
@@ -27,14 +27,14 @@ namespace MM {
 namespace MM1 {
 namespace ViewsEnh {
 
-#define COLUMN_NUM 15
-#define COLUMN_NAME 35
-#define COLUMN_CLASS 118
-#define COLUMN_LEVEL 162
-#define COLUMN_HP 180
-#define COLUMN_SP 216
-#define COLUMN_AC 250
-#define COLUMN_CONDITION 276
+#define COLUMN_NUM 5
+#define COLUMN_NAME 30
+#define COLUMN_CLASS 113
+#define COLUMN_LEVEL 157
+#define COLUMN_HP 175
+#define COLUMN_SP 211
+#define COLUMN_AC 245
+#define COLUMN_CONDITION 271
 
 QuickRef::QuickRef() : ScrollPopup("QuickRef") {
 	setBounds(Common::Rect(0, 0, 320, 146));


Commit: c1e5a933dc65721a3ceb321d481ec822c0b6c5aa
    https://github.com/scummvm/scummvm/commit/c1e5a933dc65721a3ceb321d481ec822c0b6c5aa
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-09T07:58:10-08:00

Commit Message:
MM: MM1: Fix compilation when Xeen subengine is disabled

Changed paths:
    engines/mm/shared/xeen/sound.cpp
    engines/mm/shared/xeen/sound.h


diff --git a/engines/mm/shared/xeen/sound.cpp b/engines/mm/shared/xeen/sound.cpp
index 07debccf992..7481bc37e5a 100644
--- a/engines/mm/shared/xeen/sound.cpp
+++ b/engines/mm/shared/xeen/sound.cpp
@@ -69,6 +69,7 @@ void Sound::playSound(const Common::String &name, int unused) {
 	playSound(f);
 }
 
+#ifdef ENABLE_XEEN
 void Sound::playSound(const Common::String &name, int ccNum, int unused) {
 	File f;
 	if (!f.open(name, ccNum))
@@ -76,13 +77,23 @@ void Sound::playSound(const Common::String &name, int ccNum, int unused) {
 
 	playSound(f);
 }
+#endif
 
+#ifdef ENABLE_XEEN
 void Sound::playVoice(const Common::String &name, int ccMode) {
+#else
+void Sound::playVoice(const Common::String &name) {
+#endif
 	stopSound();
 	if (!_fxOn)
 		return;
 	File f;
+#ifdef ENABLE_XEEN
 	bool result = (ccMode == -1) ? f.open(name) : f.open(name, ccMode);
+#else
+	bool result = f.open(name);
+#endif
+
 	if (!result)
 		error("Could not open sound - %s", name.c_str());
 	Common::SeekableReadStream *srcStream = f.readStream(f.size());
@@ -205,7 +216,11 @@ void Sound::playSong(const Common::String &name, int param) {
 	if (mf.open(name)) {
 		playSong(mf);
 	} else {
+#ifdef ENABLE_XEEN
 		File f(name, _musicSide);
+#else
+		File f(name);
+#endif
 		playSong(f);
 	}
 }
diff --git a/engines/mm/shared/xeen/sound.h b/engines/mm/shared/xeen/sound.h
index 8bfd0127e39..7543fc12cab 100644
--- a/engines/mm/shared/xeen/sound.h
+++ b/engines/mm/shared/xeen/sound.h
@@ -137,12 +137,12 @@ public:
 	 * Play a given sound
 	 */
 	void playSound(const Common::String &name, int unused = 0);
-
+#ifdef ENABLE_XEEN
 	/**
 	 * Play a given sound
 	 */
 	void playSound(const Common::String &name, int ccNum, int unused);
-
+#endif
 	/**
 	 * Stop playing a sound loaded from a .m file
 	 * @remarks		In the original, passing 1 to playSound stopped the sound
@@ -158,7 +158,11 @@ public:
 	/**
 	 * Play a given voice file
 	 */
+#ifdef ENABLE_XEEN
 	void playVoice(const Common::String &name, int ccMode = -1);
+#else
+	void playVoice(const Common::String &name);
+#endif
 };
 
 } // namespace Xeen