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

[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:
06c1d02522 MM: MM1: Add missing param guard to getRandomNumber
f934b0b64f MM: MM1: Fix monster selection after first monster killed


Commit: 06c1d0252281b64d6dd963b4eabe7decccb2293f
    https://github.com/scummvm/scummvm/commit/06c1d0252281b64d6dd963b4eabe7decccb2293f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-08-14T18:59:21-07:00

Commit Message:
MM: MM1: Add missing param guard to getRandomNumber

Changed paths:
    engines/mm/mm1/mm1.h


diff --git a/engines/mm/mm1/mm1.h b/engines/mm/mm1/mm1.h
index ef78570fda4..c24f0ea9231 100644
--- a/engines/mm/mm1/mm1.h
+++ b/engines/mm/mm1/mm1.h
@@ -67,6 +67,9 @@ public:
 		return _randomSource.getRandomNumber(maxNumber - minNumber + 1) + minNumber;
 	}
 	int getRandomNumber(int maxNumber) {
+		if (maxNumber < 2)
+			maxNumber = 2;
+
 		return getRandomNumber(1, maxNumber - 1);
 	}
 


Commit: f934b0b64fdb7bd5143b36f2429b93593ef02b09
    https://github.com/scummvm/scummvm/commit/f934b0b64fdb7bd5143b36f2429b93593ef02b09
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-08-14T19:09:58-07:00

Commit Message:
MM: MM1: Fix monster selection after first monster killed

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 704b1af251f..44fb096b8d2 100644
--- a/engines/mm/mm1/game/combat.cpp
+++ b/engines/mm/mm1/game/combat.cpp
@@ -123,7 +123,7 @@ void Combat::monsterIndexOf() {
 }
 
 void Combat::monsterSetPtr(int monsterNum) {
-	_monsterP = &g_globals->_encounters._monsterList[monsterNum];
+	_monsterP = _remainingMonsters[monsterNum];
 	monsterIndexOf();
 }