[Scummvm-git-logs] scummvm master -> 156336583c197562d2e073d92dd4cc9668a72044

[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:
259654a7bf MM: MM1: Fix to checking monster spell action
b2b8d32814 MM: MM1: Fix initial combat rendering if monster attacks first
156336583c MM: MM1: Fix setting up _attackersCount


Commit: 259654a7bf3e04f64efee97ea6e14a41ce94399f
    https://github.com/scummvm/scummvm/commit/259654a7bf3e04f64efee97ea6e14a41ce94399f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-03T18:44:26-08:00

Commit Message:
MM: MM1: Fix to checking monster spell action

Changed paths:
    engines/mm/mm1/game/combat.cpp


diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 9195e7c55fa..04a4f259b3b 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -621,8 +621,8 @@ void Combat::monsterAction() {
 		removeMonster();
 		setMode(MONSTER_FLEES);
 	} else {
-		// Otherwise, move on to checking if monster casts spells
-		checkMonsterSpells();
+		// Otherwise, move on to checking monster actions
+		checkMonsterActions();
 	}
 }
 
@@ -655,7 +655,7 @@ bool Combat::checkMonsterSpells() {
 
 void Combat::checkMonsterActions() {
 	if (checkMonsterSpells())
-		// Monster wandered or cast spell, so things are taken care of
+		// Monster cast spell, so things are taken care of
 		return;
 
 	_destCharCtr = 0;


Commit: b2b8d328144eb21f5b8a041a130055ccdeab90c1
    https://github.com/scummvm/scummvm/commit/b2b8d328144eb21f5b8a041a130055ccdeab90c1
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-03T20:45:27-08:00

Commit Message:
MM: MM1: Fix initial combat rendering if monster attacks first

Changed paths:
    engines/mm/mm1/game/combat.cpp
    engines/mm/mm1/views/combat.cpp


diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 04a4f259b3b..473aa646f73 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -619,6 +619,8 @@ void Combat::monsterAction() {
 		_monsterP->_hp = 0;
 		_monsterP->_status = MONFLAG_DEAD;
 		removeMonster();
+
+		_activeMonsterNum = -1;
 		setMode(MONSTER_FLEES);
 	} else {
 		// Otherwise, move on to checking monster actions
diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index fd7cf956fe3..75ca7b9a5c6 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -118,10 +118,6 @@ void Combat::draw() {
 		writeMonsterSpell();
 		delaySeconds(2);
 		return;
-	case MONSTER_ATTACK:
-		writeMonsterAttack();
-		delaySeconds(4);
-		return;
 	case INFILTRATION:
 		writeInfiltration();
 		delaySeconds(3);
@@ -167,6 +163,11 @@ void Combat::draw() {
 			delaySeconds(_spellResult._delaySeconds);
 		break;
 
+	case MONSTER_ATTACK:
+		writeMonsterAttack();
+		delaySeconds(2);
+		break;
+
 	case MONSTER_FLEES:
 	case MONSTER_WANDERS:
 		writeMonsterAction(_mode == MONSTER_FLEES);


Commit: 156336583c197562d2e073d92dd4cc9668a72044
    https://github.com/scummvm/scummvm/commit/156336583c197562d2e073d92dd4cc9668a72044
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-02-03T20:58:30-08:00

Commit Message:
MM: MM1: Fix setting up _attackersCount

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


diff --git a/engines/mm/mm1/game/combat.cpp b/engines/mm/mm1/game/combat.cpp
index 473aa646f73..34b28c6b002 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -165,7 +165,7 @@ void Combat::setupCanAttacks() {
 					g_globals->_combatParty[5]->_canAttack = true;
 			}
 
-			setupAttackerVal();
+			setupAttackersCount();
 			return;
 		}
 	}
@@ -176,17 +176,17 @@ void Combat::setupCanAttacks() {
 	for (uint i = 0; i < g_globals->_combatParty.size(); ++i)
 		g_globals->_combatParty[i]->_canAttack = true;
 
-	setupAttackerVal();
+	setupAttackersCount();
 }
 
-void Combat::setupAttackerVal() {
+void Combat::setupAttackersCount() {
 	_attackersCount = 0;
 	for (uint i = 0; i < g_globals->_combatParty.size(); ++i) {
 		if (g_globals->_combatParty[i]->_canAttack)
 			++_attackersCount;
 	}
 
-	_attackersCount = getRandomNumber(_attackersCount + 1) - 1;
+	_attackersCount += getRandomNumber(_attackersCount + 1) - 1;
 }
 
 void Combat::checkLeftWall() {
diff --git a/engines/mm/mm1/game/combat.h b/engines/mm/mm1/game/combat.h
index c9075d4318c..c077f5219e4 100644
--- a/engines/mm/mm1/game/combat.h
+++ b/engines/mm/mm1/game/combat.h
@@ -131,7 +131,7 @@ protected:
 	/**
 	 * Chooses the starting character to 
 	 */
-	void setupAttackerVal();
+	void setupAttackersCount();
 
 	/**
 	 * Checks whether the third party member