[Scummvm-git-logs] scummvm master -> 845d474016baf135c1c1f3ccb24083e45392be67

[OMGPizzaGuy]

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:
845d474016 ULTIMA8: Remove the Pentagram default mouse as we never loaded it


Commit: 845d474016baf135c1c1f3ccb24083e45392be67
    https://github.com/scummvm/scummvm/commit/845d474016baf135c1c1f3ccb24083e45392be67
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-10T12:23:12-06:00

Commit Message:
ULTIMA8: Remove the Pentagram default mouse as we never loaded it
The default mouse was only refenced in the message box gump, which is only used by the recall command in Crusader. The pointing hand cursor in Crusader is an arrow, so it should be acceptable for now.

Changed paths:
  R devtools/create_ultima/files/ultima8/mouse.tga
    engines/ultima/ultima8/gumps/message_box_gump.cpp
    engines/ultima/ultima8/kernel/mouse.cpp
    engines/ultima/ultima8/kernel/mouse.h
    engines/ultima/ultima8/ultima8.cpp


diff --git a/devtools/create_ultima/files/ultima8/mouse.tga b/devtools/create_ultima/files/ultima8/mouse.tga
deleted file mode 100644
index 427048fe5e4..00000000000
Binary files a/devtools/create_ultima/files/ultima8/mouse.tga and /dev/null differ
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.cpp b/engines/ultima/ultima8/gumps/message_box_gump.cpp
index fb8e6c00185..ad5366628a6 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.cpp
+++ b/engines/ultima/ultima8/gumps/message_box_gump.cpp
@@ -103,7 +103,7 @@ void MessageBoxGump::InitGump(Gump *newparent, bool take_focus) {
 
 	Mouse *mouse = Mouse::get_instance();
 	mouse->pushMouseCursor();
-	mouse->setMouseCursor(Mouse::MOUSE_POINTER);
+	mouse->setMouseCursor(Mouse::MOUSE_HAND);
 }
 
 void MessageBoxGump::Close(bool no_del) {
diff --git a/engines/ultima/ultima8/kernel/mouse.cpp b/engines/ultima/ultima8/kernel/mouse.cpp
index 4e564451cf5..f284876aebd 100644
--- a/engines/ultima/ultima8/kernel/mouse.cpp
+++ b/engines/ultima/ultima8/kernel/mouse.cpp
@@ -229,11 +229,9 @@ int Mouse::getMouseFrame() {
 					 //!! constants...
 	case MOUSE_NONE:
 		return -1;
-	case MOUSE_POINTER:
-		return -2;
 	case MOUSE_TARGET:
 		return 34;
-	case MOUSE_PENTAGRAM:
+	case MOUSE_WAIT:
 		return 35;
 	case MOUSE_HAND:
 		return 36;
diff --git a/engines/ultima/ultima8/kernel/mouse.h b/engines/ultima/ultima8/kernel/mouse.h
index 132ded57f59..896d1d21424 100644
--- a/engines/ultima/ultima8/kernel/mouse.h
+++ b/engines/ultima/ultima8/kernel/mouse.h
@@ -85,12 +85,11 @@ public:
 		MOUSE_NORMAL = 0,
 		MOUSE_NONE = 1,
 		MOUSE_TARGET = 2,
-		MOUSE_PENTAGRAM = 3,
+		MOUSE_WAIT = 3,
 		MOUSE_HAND = 4,
 		MOUSE_QUILL = 5,
 		MOUSE_MAGGLASS = 6,
-		MOUSE_CROSS = 7,
-		MOUSE_POINTER = 8  //!< Default pointer
+		MOUSE_CROSS = 7
 	};
 
 	enum DraggingState {
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index bde19bed0aa..e8a9930141e 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -995,7 +995,7 @@ Common::Error Ultima8Engine::saveGameStream(Common::WriteStream *stream, bool is
 		modalGump->HideGump();
 
 	_mouse->pushMouseCursor();
-	_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM);
+	_mouse->setMouseCursor(Mouse::MOUSE_WAIT);
 
 	// Redraw to indicate busy and for save thumbnail
 	paint();
@@ -1247,7 +1247,7 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
 	}
 
 	_mouse->pushMouseCursor();
-	_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM);
+	_mouse->setMouseCursor(Mouse::MOUSE_WAIT);
 	_screen->BeginPainting();
 	_mouse->paint();
 	_screen->EndPainting();