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

[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:
ff28436797 MM: MM1: Remove deprecated stubs from combat code
b80fa6a309 MM: MM1: Fix combat screen first draw for different modes


Commit: ff28436797ceb0facaa14477e4db7b4f240a9114
    https://github.com/scummvm/scummvm/commit/ff28436797ceb0facaa14477e4db7b4f240a9114
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-30T22:56:26-07:00

Commit Message:
MM: MM1: Remove deprecated stubs from combat code

Changed paths:
    engines/mm/mm1/views_enh/combat.cpp
    engines/mm/mm1/views_enh/combat.h


diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index 16c345f10d0..9fe1733871e 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -125,7 +125,6 @@ void Combat::draw() {
 	case MONSTER_ADVANCES:
 		writeBottomText(0, 0, _monsterName);
 		writeString(STRING["dialogs.combat.advances"]);
-		writeSpaces(30);
 		writeRound();
 		writeMonsters();
 		delaySeconds(2);
diff --git a/engines/mm/mm1/views_enh/combat.h b/engines/mm/mm1/views_enh/combat.h
index 6d673c81a1a..736fcd5dc3d 100644
--- a/engines/mm/mm1/views_enh/combat.h
+++ b/engines/mm/mm1/views_enh/combat.h
@@ -30,11 +30,6 @@ namespace MM1 {
 namespace ViewsEnh {
 
 class Combat : public ScrollView, public Game::Combat {
-private:
-	// TODO: Stuff to refactor
-	void writeSpaces(int count) { error("TODO"); }
-	void clearLines(int y1, int y2) { error("TODO"); }
-
 private:
 	LineArray _monsterSpellLines;
 	uint _attackableCount = 0;


Commit: b80fa6a30938953004bd68730f0848fc7e2580f1
    https://github.com/scummvm/scummvm/commit/b80fa6a30938953004bd68730f0848fc7e2580f1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-05-30T22:56:26-07:00

Commit Message:
MM: MM1: Fix combat screen first draw for different modes

Changed paths:
    engines/mm/mm1/views_enh/combat.cpp
    engines/mm/mm1/views_enh/combat.h


diff --git a/engines/mm/mm1/views_enh/combat.cpp b/engines/mm/mm1/views_enh/combat.cpp
index 9fe1733871e..d8bbdb284bc 100644
--- a/engines/mm/mm1/views_enh/combat.cpp
+++ b/engines/mm/mm1/views_enh/combat.cpp
@@ -69,6 +69,7 @@ void Combat::disableAttacks() {
 bool Combat::msgFocus(const FocusMessage &msg) {
 	g_globals->_currCharacter = g_globals->_combatParty[_currentChar];
 	MetaEngine::setKeybindingMode(KeybindingMode::KBMODE_COMBAT);
+	_firstDraw = true;
 
 	return true;
 }
@@ -115,6 +116,17 @@ bool Combat::msgGame(const GameMessage &msg) {
 }
 
 void Combat::draw() {
+	if (_firstDraw) {
+		_firstDraw = false;
+		if (_mode != SELECT_OPTION) {
+			// Do an initial screen draw to get everything displayed
+			Mode mode = _mode;
+			_mode = SELECT_OPTION;
+			draw();
+			_mode = mode;
+		}
+	}
+
 	switch (_mode) {
 	case NEXT_ROUND:
 		writeMonsters();
diff --git a/engines/mm/mm1/views_enh/combat.h b/engines/mm/mm1/views_enh/combat.h
index 736fcd5dc3d..6db46669e6f 100644
--- a/engines/mm/mm1/views_enh/combat.h
+++ b/engines/mm/mm1/views_enh/combat.h
@@ -34,6 +34,7 @@ private:
 	LineArray _monsterSpellLines;
 	uint _attackableCount = 0;
 	InfoMessage _spellResult;
+	bool _firstDraw = false;
 	// Combat options that have sub-option selection
 	enum SelectedOption {
 		OPTION_NONE, OPTION_DELAY, OPTION_EXCHANGE,