[Scummvm-git-logs] scummvm master -> 13fa3ec0b0f6726ea33769552a7ccd51ded85412

[dreammaster]

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

Summary:
8536cbbb40 ULTIMA: ULTIMA0: Music should loop
fbc3df4bfa ULTIMA: ULTIMA0: Better init of Console test characters
13fa3ec0b0 ULTIMA: ULTIMA0: Map Pause 'p' key to Quit action


Commit: 8536cbbb40c69969ccfd84affdf9883ea91faf55
    https://github.com/scummvm/scummvm/commit/8536cbbb40c69969ccfd84affdf9883ea91faf55
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-01-04T17:15:50+11:00

Commit Message:
ULTIMA: ULTIMA0: Music should loop

Changed paths:
    engines/ultima/ultima0/music.h


diff --git a/engines/ultima/ultima0/music.h b/engines/ultima/ultima0/music.h
index 45d47781f4b..5bfdfa85999 100644
--- a/engines/ultima/ultima0/music.h
+++ b/engines/ultima/ultima0/music.h
@@ -35,7 +35,7 @@ private:
 
 public:
 	MusicPlayer(const char *filename);
-	void playSMF(bool loop = false);
+	void playSMF(bool loop = true);
 
 	// Overload Audio::MidiPlayer method
 	void sendToChannel(byte channel, uint32 b) override;


Commit: fbc3df4bfa4e27de3b490ba24717bff9286ecccd
    https://github.com/scummvm/scummvm/commit/fbc3df4bfa4e27de3b490ba24717bff9286ecccd
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-01-04T17:24:48+11:00

Commit Message:
ULTIMA: ULTIMA0: Better init of Console test characters

Changed paths:
    engines/ultima/ultima0/console.cpp


diff --git a/engines/ultima/ultima0/console.cpp b/engines/ultima/ultima0/console.cpp
index 6f8603df794..1611df3efc5 100644
--- a/engines/ultima/ultima0/console.cpp
+++ b/engines/ultima/ultima0/console.cpp
@@ -84,10 +84,12 @@ bool Console::cmdDemo(int argc, const char **argv) {
 	auto &p = g_engine->_player;
 	auto &map = g_engine->_worldMap;
 
+	p.init();
 	Common::strcpy_s(p._name, "Demo");	// Characters Name
 	p._class = 'F';						// Fighter
 	p._luckyNumber = 42;					// Always the same.....
 	p._skill = 1;						// Skill level 1
+	p._task = 1;						// Starting first task
 
 	// Nice high attributes
 	Common::fill(p._attr, p._attr + MAX_ATTR, 15);
@@ -110,10 +112,13 @@ bool Console::cmdDebug(int argc, const char **argv) {
 	auto &map = g_engine->_worldMap;
 	int i;
 
+	p.init();
 	Common::strcpy_s(p._name, "Debuggo");	// Characters Name
 	p._class = 'F';							// Fighter
 	p._luckyNumber = 42;					// Always the same.....
 	p._skill = 1;							// Skill level 1
+	p._task = 1;							// Starting first task
+
 	for (i = 0; i < MAX_ATTR; i++)			// Nice high attributes
 		p._attr[i] = 99;
 	p._attr[AT_HP] = 999;


Commit: 13fa3ec0b0f6726ea33769552a7ccd51ded85412
    https://github.com/scummvm/scummvm/commit/13fa3ec0b0f6726ea33769552a7ccd51ded85412
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2026-01-04T17:27:52+11:00

Commit Message:
ULTIMA: ULTIMA0: Map Pause 'p' key to Quit action

Changed paths:
    engines/ultima/ultima0/metaengine.cpp


diff --git a/engines/ultima/ultima0/metaengine.cpp b/engines/ultima/ultima0/metaengine.cpp
index 4f4bbeea5a0..dc9b8e3017a 100644
--- a/engines/ultima/ultima0/metaengine.cpp
+++ b/engines/ultima/ultima0/metaengine.cpp
@@ -154,9 +154,11 @@ Common::KeymapArray MetaEngine::initKeymaps(KeybindingMode mode) {
 			if (r->_joy)
 				act->addDefaultInputMapping(r->_joy);
 			if (r->_action == KEYBIND_ENTER)
-				act->addDefaultInputMapping("x");
+				act->addDefaultInputMapping("x");	// x also works to eXit
 			else if (r->_action == KEYBIND_SELECT)
 				act->addDefaultInputMapping("RETURN");
+			else if (r->_action == KEYBIND_QUIT)
+				act->addDefaultInputMapping("p");	// Map "Pause" to Quit
 
 			if (r->_action == KEYBIND_UP || r->_action == KEYBIND_DOWN ||
 					r->_action == KEYBIND_LEFT || r->_action == KEYBIND_RIGHT)