thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ULTIMA8: Remove the Pentagram default mouse as we never loaded it

Browse source 
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.
This commit is contained in:
Matthew Jimenez 2022-12-10 12:22:42 -06:00
parent 69c7559bf0
commit 845d474016
5 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
devtools/create_ultima/files/ultima8/mouse.tga
View file

Binary file not shown.

2
engines/ultima/ultima8/gumps/message_box_gump.cpp
View file

@ -103,7 +103,7 @@ void MessageBoxGump::InitGump(Gump *newparent, bool take_focus) {
Mouse *mouse = Mouse::get_instance(); Mouse *mouse = Mouse::get_instance();
mouse->pushMouseCursor(); mouse->pushMouseCursor();
mouse->setMouseCursor(Mouse::MOUSE_POINTER); mouse->setMouseCursor(Mouse::MOUSE_HAND);
} }
void MessageBoxGump::Close(bool no_del) { void MessageBoxGump::Close(bool no_del) {

4
engines/ultima/ultima8/kernel/mouse.cpp
View file

@ -229,11 +229,9 @@ int Mouse::getMouseFrame() {
//!! constants... //!! constants...
case MOUSE_NONE: case MOUSE_NONE:
return -1; return -1;
case MOUSE_POINTER:
return -2;
case MOUSE_TARGET: case MOUSE_TARGET:
return 34; return 34;
case MOUSE_PENTAGRAM: case MOUSE_WAIT:
return 35; return 35;
case MOUSE_HAND: case MOUSE_HAND:
return 36; return 36;

5
engines/ultima/ultima8/kernel/mouse.h
View file

@ -85,12 +85,11 @@ public:
MOUSE_NORMAL = 0, MOUSE_NORMAL = 0,
MOUSE_NONE = 1, MOUSE_NONE = 1,
MOUSE_TARGET = 2, MOUSE_TARGET = 2,
MOUSE_PENTAGRAM = 3, MOUSE_WAIT = 3,
MOUSE_HAND = 4, MOUSE_HAND = 4,
MOUSE_QUILL = 5, MOUSE_QUILL = 5,
MOUSE_MAGGLASS = 6, MOUSE_MAGGLASS = 6,
MOUSE_CROSS = 7, MOUSE_CROSS = 7
MOUSE_POINTER = 8 //!< Default pointer
}; };
enum DraggingState { enum DraggingState {

4
engines/ultima/ultima8/ultima8.cpp
View file

@ -995,7 +995,7 @@ Common::Error Ultima8Engine::saveGameStream(Common::WriteStream *stream, bool is
modalGump->HideGump(); modalGump->HideGump();
_mouse->pushMouseCursor(); _mouse->pushMouseCursor();
_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM); _mouse->setMouseCursor(Mouse::MOUSE_WAIT);
// Redraw to indicate busy and for save thumbnail // Redraw to indicate busy and for save thumbnail
paint(); paint();
@ -1247,7 +1247,7 @@ Common::Error Ultima8Engine::loadGameStream(Common::SeekableReadStream *stream)
} }
_mouse->pushMouseCursor(); _mouse->pushMouseCursor();
_mouse->setMouseCursor(Mouse::MOUSE_PENTAGRAM); _mouse->setMouseCursor(Mouse::MOUSE_WAIT);
_screen->BeginPainting(); _screen->BeginPainting();
_mouse->paint(); _mouse->paint();
_screen->EndPainting(); _screen->EndPainting();