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

[mduggan]

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:
e6fa61f0e2 ULTIMA8: Display pentagram cursor during load/save


Commit: e6fa61f0e2b7319aba0060b26718f518bd252bdc
    https://github.com/scummvm/scummvm/commit/e6fa61f0e2b7319aba0060b26718f518bd252bdc
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-04-17T18:50:24+09:00

Commit Message:
ULTIMA8: Display pentagram cursor during load/save

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


diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index 25da365ad4..b427ff6505 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -994,6 +994,12 @@ Common::Error Ultima8Engine::saveGameStream(Common::WriteStream *stream, bool is
 	if (gump)
 		gump->OnMouseLeft();
 
+	_mouse->pushMouseCursor();
+	_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM);
+	_screen->BeginPainting();
+	_mouse->paint();
+	_screen->EndPainting();
+
 	_saveCount++;
 
 	SavegameWriter *sgw = new SavegameWriter(stream);
@@ -1054,6 +1060,8 @@ Common::Error Ultima8Engine::saveGameStream(Common::WriteStream *stream, bool is
 
 	pout << "Done" << Std::endl;
 
+	_mouse->popMouseCursor();
+
 	return Common::kNoError;
 }
 
@@ -1205,6 +1213,12 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
 		return Common::kReadingFailed;
 	}
 
+	_mouse->pushMouseCursor();
+	_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM);
+	_screen->BeginPainting();
+	_mouse->paint();
+	_screen->EndPainting();
+
 	IDataSource *ds;
 	GameInfo saveinfo;
 	ds = sg->getDataSource("GAME");
@@ -1314,6 +1328,10 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
 	if (!ok) message += "MAPS: failed\n";
 	delete ds;
 
+	// Reset mouse cursor
+	_mouse->popAllCursors();
+	_mouse->pushMouseCursor();
+
 	if (!totalok) {
 		Error(message, "Error Loading savegame", true);
 		delete sg;