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

[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:
f6f18ba8b1 MM: MM1: Yet more RiscOS fixes


Commit: f6f18ba8b16cfec0c67ffed667a0a75a6ce92933
    https://github.com/scummvm/scummvm/commit/f6f18ba8b16cfec0c67ffed667a0a75a6ce92933
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2023-01-25T20:31:14-08:00

Commit Message:
MM: MM1: Yet more RiscOS fixes

Changed paths:
    engines/mm/mm1/maps/map22.cpp
    engines/mm/mm1/maps/map23.cpp
    engines/mm/mm1/maps/map24.cpp
    engines/mm/mm1/maps/map28.cpp
    engines/mm/mm1/maps/map33.cpp
    engines/mm/mm1/maps/map47.cpp


diff --git a/engines/mm/mm1/maps/map22.cpp b/engines/mm/mm1/maps/map22.cpp
index 0c0ec3952f3..e0922d77d16 100644
--- a/engines/mm/mm1/maps/map22.cpp
+++ b/engines/mm/mm1/maps/map22.cpp
@@ -117,8 +117,8 @@ void Map22::special02() {
 					16, 2, STRING["maps.map22.ambush"],
 					[]() {
 						Game::Encounter &enc = g_globals->_encounters;
-						int monsterCount = getRandomNumber(3);
-						int idx = getRandomNumber(5) - 1;
+						int monsterCount = g_events->getRandomNumber(3);
+						int idx = g_events->getRandomNumber(5) - 1;
 						const int id1 = MONSTER_ID1[idx];
 						const int id2 = MONSTER_ID2[idx];
 
diff --git a/engines/mm/mm1/maps/map23.cpp b/engines/mm/mm1/maps/map23.cpp
index 3f1d3da1370..54440ded870 100644
--- a/engines/mm/mm1/maps/map23.cpp
+++ b/engines/mm/mm1/maps/map23.cpp
@@ -115,7 +115,8 @@ void Map23::special08() {
 		STRING["maps.map23.column"],
 		[]() {
 			g_maps->_mapPos = Common::Point(
-				getRandomNumber(15), getRandomNumber(15));
+				g_events->getRandomNumber(15),
+				g_events->getRandomNumber(15));
 			g_maps->_currentMap->updateGame();
 		}
 	));
diff --git a/engines/mm/mm1/maps/map24.cpp b/engines/mm/mm1/maps/map24.cpp
index 813832b3d75..12afaf6efc0 100644
--- a/engines/mm/mm1/maps/map24.cpp
+++ b/engines/mm/mm1/maps/map24.cpp
@@ -87,7 +87,7 @@ void Map24::special02() {
 				Game::Encounter &enc = g_globals->_encounters;
 				map[VAL1]++;
 
-				int monsterCount = getRandomNumber(4) + 3;
+				int monsterCount = g_events->getRandomNumber(4) + 3;
 				enc.clearMonsters();
 				enc.addMonster(6, 8);
 				for (int i = 1; i < monsterCount; ++i)
@@ -109,7 +109,7 @@ void Map24::special03() {
 		STRING["maps.map24.wyverns"],
 		[]() {
 			Game::Encounter &enc = g_globals->_encounters;
-			int monsterCount = getRandomNumber(4) + 3;
+			int monsterCount = g_events->getRandomNumber(4) + 3;
 			enc.clearMonsters();
 			for (int i = 1; i < monsterCount; ++i)
 				enc.addMonster(14, 7);
diff --git a/engines/mm/mm1/maps/map28.cpp b/engines/mm/mm1/maps/map28.cpp
index 6e552afb88d..2d148ee252c 100644
--- a/engines/mm/mm1/maps/map28.cpp
+++ b/engines/mm/mm1/maps/map28.cpp
@@ -65,7 +65,7 @@ void Map28::special() {
 					g_maps->clearSpecial();
 					map[VAL1]++;
 
-					int val = getRandomNumber(10);
+					int val = g_events->getRandomNumber(10);
 					switch (val) {
 					case 1:
 						g_events->send(SoundMessage(STRING["maps.map28.nothing"]));
@@ -119,7 +119,8 @@ void Map28::special() {
 					case 8:
 						g_events->send(SoundMessage(STRING["maps.map28.poof"]));
 						g_maps->_mapPos = Common::Point(
-							getRandomNumber(15), getRandomNumber(15));
+							g_events->getRandomNumber(15),
+							g_events->getRandomNumber(15));
 						map.updateGame();
 						break;
 
@@ -146,21 +147,21 @@ void Map28::special00() {
 				switch (ks.keycode) {
 				case Common::KEYCODE_a:
 					g_events->close();
-					g_globals->_treasure.setGold((getRandomNumber(8) + 8) * 256);
+					g_globals->_treasure.setGold((g_events->getRandomNumber(8) + 8) * 256);
 					g_maps->clearSpecial();
 					g_events->addAction(KEYBIND_SEARCH);
 					break;
 
 				case Common::KEYCODE_b:
 					g_events->close();
-					g_globals->_treasure.setGems(getRandomNumber(50) + 200);
+					g_globals->_treasure.setGems(g_events->getRandomNumber(50) + 200);
 					g_maps->clearSpecial();
 					g_events->addAction(KEYBIND_SEARCH);
 					break;
 
 				case Common::KEYCODE_c:
 					g_events->close();
-					g_globals->_treasure._items[2] = getRandomNumber(22) + 196;
+					g_globals->_treasure._items[2] = g_events->getRandomNumber(22) + 196;
 					g_maps->clearSpecial();
 					g_events->addAction(KEYBIND_SEARCH);
 					break;
diff --git a/engines/mm/mm1/maps/map33.cpp b/engines/mm/mm1/maps/map33.cpp
index 6ca136e1529..862a8621608 100644
--- a/engines/mm/mm1/maps/map33.cpp
+++ b/engines/mm/mm1/maps/map33.cpp
@@ -194,7 +194,7 @@ void Map33::search(const Common::String &msg) {
 		[]() {
 			Map33 &map = *static_cast<Map33 *>(g_maps->_currentMap);
 			Game::Encounter &enc = g_globals->_encounters;
-			int monsterCount = getRandomNumber(6) + 7;
+			int monsterCount = g_events->getRandomNumber(6) + 7;
 
 			enc.clearMonsters();
 			enc.addMonster(map[VAL1], map[VAL2]);
diff --git a/engines/mm/mm1/maps/map47.cpp b/engines/mm/mm1/maps/map47.cpp
index 8610cbb5ea5..cf56a10cee9 100644
--- a/engines/mm/mm1/maps/map47.cpp
+++ b/engines/mm/mm1/maps/map47.cpp
@@ -66,7 +66,7 @@ void Map47::special01() {
 		STRING["maps.map47.gong"],
 		[]() {
 			Map47 &map = *static_cast<Map47 *>(g_maps->_currentMap);
-			int toneNum = getRandomNumber(6);
+			int toneNum = g_events->getRandomNumber(6);
 			if (toneNum < 4) {
 				g_events->send(SoundMessage(STRING[
 					Common::String::format("maps.map47.tones.%d", toneNum)]));