libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCUMM: Changed the workaround for verbs drawn in room 80

Browse Source 
It turns out that checking the room height causes verbs not to be
redrawn after reading books. Let's just limit it to room 80, and hope
there aren't any other cases.
This commit is contained in:
Torbjörn Andersson 2021-06-30 08:53:37 +02:00 committed by Torbjörn Andersson
parent 0de3b584ea
commit 5f2bf42f84
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/scumm/verbs.cpp
View File

@ -1085,19 +1085,15 @@ void ScummEngine::drawVerb(int verb, int mode) {
// and then counts on the background to draw over them. Obviously that
// won't work here.
//
// As far as I can tell, all normal rooms, i.e. rooms that could
// sensibly have verbs, are 128 pixels tall. Other heights I've seen
// are 136, 176, 184, 192 and 200, probably depending at least partly
// on how much text is displayed in them.
//
// So to work around the issue, we only draw verbs in rooms that are
// 128 pixels tall and hope for the best.
// I thought it would be possible to base this workaround on room
// height, but then verbs aren't redrawn after reading books. So I
// guess the safest path is to limit it to this particular room.
//
// Note that with the low-resolution font, which does implement the
// "has mask" feature, the Macintosh version still needs a hack in
// printChar() for black text to work properly. This version of the
// game is weird.
if (_game.id == GID_INDY3 && _macScreen && _roomHeight > 128)
if (_game.id == GID_INDY3 && _macScreen && _currentRoom == 80)
return;
vs = &_verbs[verb];