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

[dreammaster]

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

Summary:
9609d89e66 MM: MM1: Map 2 fixes
2ceade4308 MM: MM1: Removed deprecated name formatting
f7ff46d95d MM: MM1: Fix pressing Enter on death screen


Commit: 9609d89e66b173db8d9488854bea935037a43f2a
    https://github.com/scummvm/scummvm/commit/9609d89e66b173db8d9488854bea935037a43f2a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-30T21:56:33-07:00

Commit Message:
MM: MM1: Map 2 fixes

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 6f836ca883d..03729f69b37 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -1005,16 +1005,16 @@ maps:
 		blacksmith_inside: "Busily forging a long sword, an extremely beautiful young girl says with a seductive smile, \"Can i help you (Y/N)?\""
 
 	map02:
-		blacksmith: "\"Swampside supplies\""
-		inn: "\"The inn of Algary\""
-		market: "\"Arcon's slop\""
-		tavern: "\"Jolly jester tavern\""
-		temple: "\"Temple half-dead\""
-		training: "\"Dragons claw training\""
-		docks: "\"Ye old docks\""
-
-		blacksmith_inside: "A man enclosed in a steel cage says,\n\"can i help you find anything (Y/N)?\""
-		inn_inside: "Standing behind a large desk, a tall\nbearded half-orc grunts, \"If you don't\nsign in, you can't stay! well (Y/N)?\""
+		blacksmith: "\"Swampside Supplies\""
+		inn: "\"The Inn of Algary\""
+		market: "\"Arcon's Slop\""
+		tavern: "\"Jolly Jester Tavern\""
+		temple: "\"Temple Half-dead\""
+		training: "\"Dragons Claw Training\""
+		docks: "\"Ye Old Docks\""
+
+		blacksmith_inside: "A man enclosed in a steel cage says,\n\"Can i help you find anything (Y/N)?\""
+		inn_inside: "Standing behind a large desk, a tall\nbearded half-orc grunts, \"If you don't\nsign in, you can't stay! Well (Y/N)?\""
 		market_inside: "A putrid smell pervades the room...\nlook for some food (Y/N)?"
 		temple_inside: "An ancient looking cleric staggers up to\nthe party gasping, \"I can help,\nreally i can!\" Accept the offer (Y/N)?"
 		training_inside: "several adventurers armored in dragon\nscales, address the party,\n\"Looking for training (Y/N)?\""


Commit: 2ceade4308f5f6a97c0c5ab736d26a273ecfc75b
    https://github.com/scummvm/scummvm/commit/2ceade4308f5f6a97c0c5ab736d26a273ecfc75b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-30T21:56:33-07:00

Commit Message:
MM: MM1: Removed deprecated name formatting

Changed paths:
    engines/mm/mm1/data/monsters.h


diff --git a/engines/mm/mm1/data/monsters.h b/engines/mm/mm1/data/monsters.h
index 1345d701b49..5a6b773a5f9 100644
--- a/engines/mm/mm1/data/monsters.h
+++ b/engines/mm/mm1/data/monsters.h
@@ -86,7 +86,7 @@ struct Monster {
 	byte _ac = 0;
 
 	Common::String getDisplayName() const {
-		return Common::String::format("|%s|", _name.c_str());
+		return _name;
 	}
 };
 


Commit: f7ff46d95de9aba7a5af58abc7ff54e6302b64ce
    https://github.com/scummvm/scummvm/commit/f7ff46d95de9aba7a5af58abc7ff54e6302b64ce
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-03-30T21:56:33-07:00

Commit Message:
MM: MM1: Fix pressing Enter on death screen

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


diff --git a/engines/mm/mm1/views/dead.cpp b/engines/mm/mm1/views/dead.cpp
index 40d97f31da3..ad0faeb6bea 100644
--- a/engines/mm/mm1/views/dead.cpp
+++ b/engines/mm/mm1/views/dead.cpp
@@ -57,8 +57,8 @@ void Dead::writeLine(int y) {
 		writeChar(i == 0 || i == 39 ? '+' : '-');
 }
 
-bool Dead::msgKeypress(const KeypressMessage &msg) {
-	if (msg.keycode == Common::KEYCODE_RETURN) {
+bool Dead::msgAction(const ActionMessage &msg) {
+	if (msg._action == KEYBIND_SELECT) {
 		replaceView("MainMenu");
 		return true;
 	}
diff --git a/engines/mm/mm1/views/dead.h b/engines/mm/mm1/views/dead.h
index f4cc028af98..d96a05ffff3 100644
--- a/engines/mm/mm1/views/dead.h
+++ b/engines/mm/mm1/views/dead.h
@@ -40,7 +40,7 @@ public:
 
 	bool msgFocus(const FocusMessage &msg) override;
 	void draw() override;
-	bool msgKeypress(const KeypressMessage &msg) override;
+	bool msgAction(const ActionMessage &msg) override;
 };
 
 } // namespace Views