[Scummvm-git-logs] scummvm master -> 46bd51bf405270630053dd488ead0b811cfecaab

[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:
8b4ce312d3 MM: MM1: Clarify selecting towns in main menu
46bd51bf40 MM: MM1: Proper monsters defeated view at end of combat


Commit: 8b4ce312d397027f3f84a0afa56f048820e8cd51
    https://github.com/scummvm/scummvm/commit/8b4ce312d397027f3f84a0afa56f048820e8cd51
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-31T21:30:20-07:00

Commit Message:
MM: MM1: Clarify selecting towns in main menu

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml
    engines/mm/mm1/views_enh/main_menu.cpp


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index ebe020dcc21..85ecba84d65 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -104,6 +104,8 @@ dialogs:
 		option1: "'C'.......Create New Characters"
 		option2: "'V'.......View All Characters"
 		option3: "'#'.......Go to Town"
+		option3e1: "'1' to '5'"
+		option3e2: "Go to Town"
 		copyright1: "Copr. 1986,1987-Jon Van Caneghem"
 		copyright2: "All Rights Reserved"
 		scummvm: "Enhanced version provided by ScummVM"
diff --git a/engines/mm/mm1/views_enh/main_menu.cpp b/engines/mm/mm1/views_enh/main_menu.cpp
index 0270cc35233..d0fed2f5a6c 100644
--- a/engines/mm/mm1/views_enh/main_menu.cpp
+++ b/engines/mm/mm1/views_enh/main_menu.cpp
@@ -116,14 +116,15 @@ void MainMenu::draw() {
 
 	Common::String line1 = STRING["dialogs.main_menu.option1"];
 	Common::String line2 = STRING["dialogs.main_menu.option2"];
-	Common::String line3 = STRING["dialogs.main_menu.option3"];
+	Common::String line31 = STRING["dialogs.main_menu.option3e1"];
+	Common::String line32 = STRING["dialogs.main_menu.option3e2"];
 
 	writeString(80, 120, Common::String(line1.c_str(), line1.c_str() + 3));
 	writeString(80, 130, Common::String(line2.c_str(), line2.c_str() + 3));
-	writeString(80, 140, Common::String(line3.c_str(), line3.c_str() + 3));
+	writeString(43, 140, line31);
 	writeString(110, 120, Common::String(line1.c_str() + line1.findLastOf('.') + 1));
 	writeString(110, 130, Common::String(line2.c_str() + line2.findLastOf('.') + 1));
-	writeString(110, 140, Common::String(line3.c_str() + line3.findLastOf('.') + 1));
+	writeString(110, 140, line32);
 
 	writeString(0, 165, STRING["dialogs.main_menu.copyright1"], ALIGN_MIDDLE);
 	writeString(0, 175, STRING["dialogs.main_menu.scummvm"], ALIGN_MIDDLE);


Commit: 46bd51bf405270630053dd488ead0b811cfecaab
    https://github.com/scummvm/scummvm/commit/46bd51bf405270630053dd488ead0b811cfecaab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-31T21:30:20-07:00

Commit Message:
MM: MM1: Proper monsters defeated view at end of combat

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml
    engines/mm/mm1/views_enh/combat.cpp


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 85ecba84d65..b1753f365e6 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -377,7 +377,7 @@ dialogs:
 		and_goes_down: "and goes down!!!"
 		goes_down: "goes down!!!"
 		dies: "dies!"
-		defeating1: "! for defeating the monsters !"
+		defeating1: "! For defeating the monsters !"
 		defeating2: "!   each survivor receives   !"
 		xp: "experience points."
 		regenerate: "some monsters regenerate!"
diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index d8bbdb284bc..d2c61ad7dd1 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -169,7 +169,7 @@ void Combat::draw() {
 	case DEFEATED_MONSTERS:
 		writeDefeat();
 		Sound::sound2(SOUND_3);
-		delaySeconds(3);
+		delaySeconds(5);
 		return;
 	default:
 		break;
@@ -707,16 +707,18 @@ void Combat::clearPartyArea() {
 }
 
 void Combat::writeDefeat() {
-	writeString(10, 0, "+----------------------------+");
-	for (int y = 1; y < 8; ++y)
-		writeString(10, y, "!                            !");
-	writeString(10, 8, "+----------------------------+");
-
-	writeString(10, 2, STRING["dialogs.combat.defeating1"]);
-	writeString(10, 4, STRING["dialogs.combat.defeating2"]);
-	writeNumber(14, 6, _totalExperience);
-	_textPos.x++;
-	writeString(STRING["dialogs.combat.xp"]);
+	Common::String line1 = STRING["dialogs.combat.defeating1"];
+	Common::String line2 = STRING["dialogs.combat.defeating2"];
+	line1 = Common::String(line1.c_str() + 1, line1.c_str() + line1.size() - 2);
+	line2 = Common::String(line2.c_str() + 1, line2.c_str() + line2.size() - 2);
+	Common::String line3 = Common::String::format("%d %s",
+		_totalExperience, STRING["dialogs.combat.xp"].c_str());
+
+	setBounds(Common::Rect(50, 40, 270, 100));
+	ScrollView::draw();
+	writeLine(0, line1, ALIGN_MIDDLE);
+	writeLine(2, line2, ALIGN_MIDDLE);
+	writeLine(4, line3, ALIGN_MIDDLE);
 }
 
 void Combat::highlightNextRound() {