[Scummvm-git-logs] scummvm master -> 1d909ef9ba1cfca7ee892cfb77b3f6ada11de119

[mduggan]

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:
a84bc95a3b ULTIMA8: JANITORIAL: Add comments on workarounds
1d909ef9ba ULTIMA8: Hide mouse cursor on splash screen


Commit: a84bc95a3bb4241cf3512beb6f657a73f51caef4
    https://github.com/scummvm/scummvm/commit/a84bc95a3bb4241cf3512beb6f657a73f51caef4
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-18T11:59:28+09:00

Commit Message:
ULTIMA8: JANITORIAL: Add comments on workarounds

Changed paths:
    engines/ultima/ultima8/usecode/uc_machine.cpp
    engines/ultima/ultima8/world/map.cpp


diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index e08ecb8614..fb5a9e28d4 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -1091,8 +1091,8 @@ void UCMachine::execProcess(UCProcess *p) {
 					if (ui16a < l->getSize()) {
 						p->_stack.push((*l)[ui16a], ui32a);
 					} else {
-						perr << "Warning: ignore 0x44 request to push " << ui16a <<
-								" from list len " << l->getSize() << Std::endl;
+						// WORKAROUND
+						warning("ignore 0x44 request to push %d from list len %d", ui16a, l->getSize());
 					}
 				}
 			}
diff --git a/engines/ultima/ultima8/world/map.cpp b/engines/ultima/ultima8/world/map.cpp
index a70d2e7f60..610a14ab5e 100644
--- a/engines/ultima/ultima8/world/map.cpp
+++ b/engines/ultima/ultima8/world/map.cpp
@@ -87,6 +87,8 @@ void Map::addMapFix(uint32 shape, uint32 frame, int32 x, int32 y, int32 z) {
 void Map::loadFixed(Common::SeekableReadStream *rs) {
 	loadFixedFormatObjects(_fixedItems, rs, Item::EXT_FIXED);
 
+	// WORKAROUND - add some missing map tiles from game data
+
 	// U8 hack for missing ground tiles on map 25. See docs/u8bugs.txt
 	if (GAME_IS_U8 && _mapNum == 25) {
 		// TODO


Commit: 1d909ef9ba1cfca7ee892cfb77b3f6ada11de119
    https://github.com/scummvm/scummvm/commit/1d909ef9ba1cfca7ee892cfb77b3f6ada11de119
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-18T12:26:04+09:00

Commit Message:
ULTIMA8: Hide mouse cursor on splash screen

Changed paths:
    engines/ultima/ultima8/ultima8.cpp


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index b427ff6505..c02bd49814 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -642,10 +642,12 @@ void Ultima8Engine::GraphicSysInit() {
 
 	_screen = new_screen;
 
-	// Show the splash _screen immediately now that the _screen has been set up
+	// Show the splash screen immediately now that the screen has been set up
 	int saveSlot = ConfMan.hasKey("save_slot") ? ConfMan.getInt("save_slot") : -1;
-	if (saveSlot == -1)
+	if (saveSlot == -1) {
+		_mouse->setMouseCursor(Mouse::MOUSE_NONE);
 		showSplashScreen();
+	}
 
 	bool ttf_antialiasing = true;
 	_settingMan->setDefault("ttf_antialiasing", true);