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

COMI/DIG always redraws verbs too

Browse source 
Remove old var, no longer required

svn-id: r14481
This commit is contained in:
Travis Howell 2004-08-06 06:19:14 +00:00
parent fac44fbfec
commit e8a10c219e
4 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/script_v8.cpp
View file

@ -1082,8 +1082,6 @@ void ScummEngine_v8::o8_verbOps() {
VerbSlot *vs = NULL; VerbSlot *vs = NULL;
int slot, a, b; int slot, a, b;
_verbRedraw = true;
if (subOp == 0x96) { if (subOp == 0x96) {
_curVerb = pop(); _curVerb = pop();
_curVerbSlot = getVerbSlot(_curVerb, 0); _curVerbSlot = getVerbSlot(_curVerb, 0);

13
scumm/scumm.cpp
View file

@ -566,7 +566,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_PALS_offs = 0; _PALS_offs = 0;
_fullRedraw = false; _fullRedraw = false;
_BgNeedsRedraw = false; _BgNeedsRedraw = false;
_verbRedraw = false;
_screenEffectFlag = false; _screenEffectFlag = false;
_completeScreenRedraw = false; _completeScreenRedraw = false;
memset(&_cursor, 0, sizeof(_cursor)); memset(&_cursor, 0, sizeof(_cursor));
@ -1054,8 +1053,6 @@ void ScummEngine::launch() {
#endif #endif
_minHeapThreshold = 400000; _minHeapThreshold = 400000;
_verbRedraw = false;
allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0); allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
setupScummVars(); setupScummVars();
@ -1650,7 +1647,6 @@ load_game:
checkV2MouseOver(_mouse); checkV2MouseOver(_mouse);
} }
_verbRedraw = false;
_fullRedraw = true; _fullRedraw = true;
} }
@ -1688,9 +1684,8 @@ load_game:
processDrawQue(); processDrawQue();
// Full Throttle always redraws verbs and draws verbs before actors // Full Throttle always redraws verbs and draws verbs before actors
if ((_gameId == GID_FT) || _verbRedraw) { if (_gameId == GID_FT)
redrawVerbs(); redrawVerbs();
}
setActorRedrawFlags(); setActorRedrawFlags();
resetActorBgs(); resetActorBgs();
@ -1707,6 +1702,8 @@ load_game:
if (_version >= 4 && _heversion <= 60) if (_version >= 4 && _heversion <= 60)
cyclePalette(); cyclePalette();
palManipulate(); palManipulate();
if (_gameId == GID_DIG || _gameId == GID_CMI)
redrawVerbs();
if (_doEffect) { if (_doEffect) {
_doEffect = false; _doEffect = false;
@ -1714,11 +1711,9 @@ load_game:
clearClickedStatus(); clearClickedStatus();
} }
if (!_verbRedraw && _cursor.state > 0) if (_cursor.state > 0)
verbMouseOver(checkMouseOver(_mouse.x, _mouse.y)); verbMouseOver(checkMouseOver(_mouse.x, _mouse.y));
_verbRedraw = false;
if (_version <= 2) { if (_version <= 2) {
if (oldEgo != VAR(VAR_EGO)) { if (oldEgo != VAR(VAR_EGO)) {
// FIXME/TODO: Reset and redraw the sentence line // FIXME/TODO: Reset and redraw the sentence line

2
scumm/scumm.h
View file

@ -860,7 +860,7 @@ protected:
StripTable *_roomStrips; StripTable *_roomStrips;
//ender: fullscreen //ender: fullscreen
bool _fullRedraw, _BgNeedsRedraw, _verbRedraw; bool _fullRedraw, _BgNeedsRedraw;
bool _screenEffectFlag, _completeScreenRedraw; bool _screenEffectFlag, _completeScreenRedraw;
struct { struct {

6
scumm/verbs.cpp
View file

@ -265,7 +265,7 @@ void ScummEngine::redrawVerbs() {
return; return;
int i, verb = 0; int i, verb = 0;
if ((_gameId == GID_FT) || _cursor.state > 0) if (_version >= 7 || _cursor.state > 0)
verb = checkMouseOver(_mouse.x, _mouse.y); verb = checkMouseOver(_mouse.x, _mouse.y);
for (i = _numVerbs-1; i >= 0; i--) { for (i = _numVerbs-1; i >= 0; i--) {
@ -419,7 +419,7 @@ void ScummEngine::drawVerb(int verb, int mode) {
} }
void ScummEngine::restoreVerbBG(int verb) { void ScummEngine::restoreVerbBG(int verb) {
if (_gameId == GID_FT || _gameId == GID_CMI) if (_version >= 7)
return; return;
VerbSlot *vs; VerbSlot *vs;
@ -521,7 +521,7 @@ void ScummEngine::killVerb(int slot) {
nukeResource(rtVerb, slot); nukeResource(rtVerb, slot);
if (vs->saveid == 0) { if (_version <= 6 && vs->saveid == 0) {
drawVerb(slot, 0); drawVerb(slot, 0);
verbMouseOver(0); verbMouseOver(0);
} }