[Scummvm-git-logs] scummvm master -> 49aa54354091dc4b283f4cfa4cb9eac42ed1e2ec

[dreammaster]

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

Summary:
49aa543540 MM: MM1: Fix highlighting next round


Commit: 49aa54354091dc4b283f4cfa4cb9eac42ed1e2ec
    https://github.com/scummvm/scummvm/commit/49aa54354091dc4b283f4cfa4cb9eac42ed1e2ec
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-04T15:48:21-08:00

Commit Message:
MM: MM1: Fix highlighting next round

Changed paths:
    devtools/create_mm/files/mm1/strings_en.yml
    engines/mm/mm1/gfx/bitmap_font.h
    engines/mm/mm1/views/combat.cpp


diff --git a/devtools/create_mm/files/mm1/strings_en.yml b/devtools/create_mm/files/mm1/strings_en.yml
index 8763eaecbe8..7cee838c92d 100644
--- a/devtools/create_mm/files/mm1/strings_en.yml
+++ b/devtools/create_mm/files/mm1/strings_en.yml
@@ -348,7 +348,7 @@ dialogs:
 		combat: "combat!"
 	combat:
 		combat: "combat"
-		round: "round #:"
+		round: "Round #"
 		delay: "d delay"
 		protect: "p protect"
 		quickref: "q quickref"
@@ -1633,4 +1633,4 @@ maps:
 		keeper3: "in a serene voice, the data keeper says,\n""welcome to your inner sanctum\nvarnlings! i am very pleased that you've\nmade it this far. you are to be\ncommended. i've been monitoring your\nprogress."" turning to the strange\nmechanical device, he inserts a flat\nobject into a slot. your party's current\nperformance total=%u"
 		keeper4: """you are not yet worthy for transfer.   return after defeating the imposter."""
 		keeper5: "excellent rating! this is a rare        occasion, for only a privileged few are given the opportunity for transfer to\nanother v.a.r.n. (vehicular astropod\nresearch nacelle). return now to the\ninn of sorpigal for rest and celebration\nthen continue on to your new assignment at the gates to another world...""       (+50000 exp for your accomplishment!)\n----------------------------------------\nplease send your performance total to\nnew world computing, inc.\n  p. o. box 2068  van nuys, ca  91404"
- 
+ 
diff --git a/engines/mm/mm1/gfx/bitmap_font.h b/engines/mm/mm1/gfx/bitmap_font.h
index e345308688c..3a9904a71e5 100644
--- a/engines/mm/mm1/gfx/bitmap_font.h
+++ b/engines/mm/mm1/gfx/bitmap_font.h
@@ -32,11 +32,13 @@ namespace Gfx {
 class BitmapFont : public ::MM::BitmapFont {
 public:
 	void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override {
-		MM::BitmapFont::drawChar(dst, toupper(chr), x, y, color);
+		chr = (chr & 0x80) | toupper(chr & 0x7f);
+		MM::BitmapFont::drawChar(dst, chr, x, y, color);
 	}
 
 	void drawChar(Graphics::ManagedSurface *dst, uint32 chr, int x, int y, uint32 color) const override {
-		MM::BitmapFont::drawChar(dst, toupper(chr), x, y, color);
+		chr = (chr & 0x80) | toupper(chr & 0x7f);
+		MM::BitmapFont::drawChar(dst, chr, x, y, color);
 	}
 };
 
diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index 19c46403da9..40449349130 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -47,6 +47,10 @@ void Combat::setMode(Mode newMode) {
 		// Make a copy of monster spell 
 		_monsterSpellLines = getMonsterSpellMessage();
 
+	if (_mode != MONSTER_ADVANCES && _mode != MONSTER_ATTACK &&
+			_mode != MONSTER_SPELL)
+		_activeMonsterNum = -1;
+
 	redraw();
 }
 
@@ -98,6 +102,7 @@ bool Combat::msgGame(const GameMessage &msg) {
 void Combat::draw() {
 	switch (_mode) {
 	case NEXT_ROUND:
+		writeMonsters();
 		resetBottom();
 		highlightNextRound();
 		delaySeconds(1);