[Scummvm-git-logs] scummvm master -> 5502b6690f1f52b13e29f19ea39c6f25746438b2

[dreammaster]

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

Summary:
5502b6690f MM: MM1: Fix classic combat target crashes


Commit: 5502b6690f1f52b13e29f19ea39c6f25746438b2
    https://github.com/scummvm/scummvm/commit/5502b6690f1f52b13e29f19ea39c6f25746438b2
Author: Scorp (scorp at mrs.mn)
Date: 2026-06-06T21:38:50+10:00

Commit Message:
MM: MM1: Fix classic combat target crashes

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 b12442f46d6..cb04d480564 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -673,7 +673,7 @@ void Combat::checkMonsterActions() {
 	_monsterP->_counterFlags--;
 
 	// Pick a random character to shoot at
-	int charNum = getRandomNumber(g_globals->_party.size()) - 1;
+	int charNum = CLIP<int>(getRandomNumber(g_globals->_party.size()) - 1, 0, (int)g_globals->_party.size() - 1);
 	Character &c = g_globals->_party[charNum];
 	g_globals->_currCharacter = &c;
 
diff --git a/engines/mm/mm1/views/combat.cpp b/engines/mm/mm1/views/combat.cpp
index 9f1f5388897..1240991a755 100644
--- a/engines/mm/mm1/views/combat.cpp
+++ b/engines/mm/mm1/views/combat.cpp
@@ -190,6 +190,9 @@ void Combat::draw() {
 }
 
 void Combat::timeout() {
+	if (!isFocused())
+		return;
+
 	switch (_mode) {
 	case NEXT_ROUND:
 		nextRound2();