libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 18:02:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source 
svn-id: r14236
This commit is contained in:
Travis Howell 2004-07-17 10:25:22 +00:00
parent 5b238e17c1
commit 002b9331a8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scumm/resource.cpp
View File

@ -625,7 +625,7 @@ void ScummEngine::ensureResourceLoaded(int type, int i) {
loadResource(type, i);
if ((_version <= 6 && _heversion <= 70) && !(_features & GF_SMALL_HEADER))
if (VAR_ROOM_FLAG != 0xFF)
if (type == rtRoom && i == _roomResource)
VAR(VAR_ROOM_FLAG) = 1;
}

8
scumm/verbs.cpp
View File

@ -379,8 +379,7 @@ void ScummEngine::drawVerb(int verb, int mode) {
return;
}
if (_gameId != GID_FT)
restoreVerbBG(verb);
restoreVerbBG(verb);
_string[4].charset = vs->charset_nr;
_string[4].xpos = vs->curRect.left;
@ -414,12 +413,15 @@ void ScummEngine::drawVerb(int verb, int mode) {
vs->curRect.bottom = _charset->_str.bottom;
vs->oldRect = _charset->_str;
_charset->_str.left = _charset->_str.right;
} else if (_gameId != GID_FT) {
} else {
restoreVerbBG(verb);
}
}
void ScummEngine::restoreVerbBG(int verb) {
if (_gameId == GID_FT)
return;
VerbSlot *vs;
vs = &_verbs[verb];