[Scummvm-git-logs] scummvm master -> 32cbdebb68738909c6541993d88fc1d20e803ec7

[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:
32cbdebb68 MM: MM1: Fix applying combat damage to correct monster


Commit: 32cbdebb68738909c6541993d88fc1d20e803ec7
    https://github.com/scummvm/scummvm/commit/32cbdebb68738909c6541993d88fc1d20e803ec7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-06-05T20:53:54-07:00

Commit Message:
MM: MM1: Fix applying combat damage to correct monster

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 aec0bc26604..4c869ef8dac 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -124,6 +124,7 @@ void Combat::monsterIndexOf() {
 
 void Combat::monsterSetPtr(int monsterNum) {
 	_monsterP = &g_globals->_encounters._monsterList[monsterNum];
+	monsterIndexOf();
 }
 
 void Combat::setupCanAttacks() {