libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: set fallback cursor when custom cursor is not read correctly.

Browse Source
This commit is contained in:
ysj1173886760 2021-08-14 21:41:32 +08:00
parent 267d8b8e44
commit 4766fd025b
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engines/director/cursor.cpp
View File

@ -120,7 +120,7 @@ void Cursor::readFromCast(CastMemberID cursorId, CastMemberID maskId) {
_hotspotY = bc->_regY - bc->_initialRect.top;
}
void Cursor::readFromResource(int resourceId) {
void Cursor::readBuiltinType(int resourceId) {
if (resourceId == _cursorResId)
return;
@ -145,8 +145,27 @@ void Cursor::readFromResource(int resourceId) {
resetCursor(Graphics::kMacCursorOff, true, resourceId);
break;
default:
_usePalette = true;
_keyColor = 0xff;
warning("Cursor::readBuiltinType failed to read cursor %d", resourceId);
break;
}
}
void Cursor::readFromResource(int resourceId) {
if (resourceId == _cursorResId)
return;
switch(resourceId) {
case -1:
case 0:
case 1:
case 2:
case 3:
case 4:
case 200:
readBuiltinType(resourceId);
break;
default:
bool readSuccessful = false;
for (Common::HashMap<Common::String, Archive *, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo>::iterator it = g_director->_openResFiles.begin(); it != g_director->_openResFiles.end(); ++it) {
Common::SeekableReadStreamEndian *cursorStream;
@ -156,10 +175,18 @@ void Cursor::readFromResource(int resourceId) {
cursorStream = ((MacArchive *)it->_value)->getResource(MKTAG('C', 'R', 'S', 'R'), resourceId);
if (cursorStream && readFromStream(*((Common::SeekableReadStream *)cursorStream), false, 0)) {
_usePalette = true;
_keyColor = 0xff;
readSuccessful = true;
resetCursor(Graphics::kMacCursorCustom, false, resourceId);
break;
}
}
// fallback method. try to use builtin cursor by regarding resourceId as a single byte.
if (!readSuccessful)
readBuiltinType(resourceId & 0x7f);
}
}

1
engines/director/cursor.h
View File

@ -43,6 +43,7 @@ class Cursor : public Graphics::MacCursor {
void readFromCast(CastMemberID cursorId, CastMemberID maskId);
void readFromResource(int resourceId);
void readBuiltinType(int resourceId);
bool isEmpty() { return _cursorResId == 0 && _cursorCastId.member == 0; }
bool operator==(const Cursor &c);