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

LAB: Get rid of the _doNotDrawMessage hack (from the original)

Browse source 
This is actually a nasty hack in the original to avoid duplicate
messages, but it ended up hiding some game messages. This hack isn't
really necessary at all for game functionality, so it has been
removed, without any notable side-effects
This commit is contained in:
Filippos Karapetis 2015-12-22 22:41:56 +02:00 • committed by Willem Jan Palenstijn
parent 966f82d82e
commit f59ccf534c
4 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/lab/engine.cpp
View file

@ -592,7 +592,6 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
if (_graphics->_longWinInFront) {
if ((msgClass == kMessageRawKey) || (leftButtonClick || rightButtonClick)) {
_graphics->_longWinInFront = false;
_graphics->_doNotDrawMessage = false;
_graphics->drawPanel();
drawRoomMessage(curInv, _closeDataPtr);
_graphics->screenUpdate();
@ -628,7 +627,6 @@ bool LabEngine::fromCrumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Commo
eatMessages();
_alternate = !_alternate;
_anim->_doBlack = true;
_graphics->_doNotDrawMessage = false;
_mainDisplay = true;
// Sets the correct button list
interfaceOn();
@ -701,7 +699,6 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
eatMessages();
_alternate = false;
_anim->_doBlack = true;
_graphics->_doNotDrawMessage = false;
_mainDisplay = true;
// Sets the correct button list
@ -721,7 +718,6 @@ bool LabEngine::processKey(IntuiMessage *curMsg, uint32 &msgClass, uint16 &quali
}
} else if ((code == Common::KEYCODE_x) || (code == Common::KEYCODE_q)) {
// Quit?
_graphics->_doNotDrawMessage = false;
_graphics->drawMessage("Do you want to quit? (Y/N)");
eatMessages();
interfaceOff();
@ -792,7 +788,6 @@ void LabEngine::processMainButton(uint16 &curInv, uint16 &lastInv, uint16 &oldDi
_alternate = true;
_anim->_doBlack = true;
_graphics->_doNotDrawMessage = false;
// Sets the correct button list
interfaceOn();
_mainDisplay = false;
@ -909,7 +904,6 @@ void LabEngine::processAltButton(uint16 &curInv, uint16 &lastInv, uint16 buttonI
eatMessages();
_alternate = false;
_anim->_doBlack = true;
_graphics->_doNotDrawMessage = false;
_mainDisplay = true;
// Sets the correct button list
@ -971,14 +965,12 @@ void LabEngine::processAltButton(uint16 &curInv, uint16 &lastInv, uint16 buttonI
case kButtonPrevItem:
decIncInv(&curInv, true);
lastInv = curInv;
_graphics->_doNotDrawMessage = false;
drawRoomMessage(curInv, _closeDataPtr);
break;
case kButtonNextItem:
decIncInv(&curInv, false);
lastInv = curInv;
_graphics->_doNotDrawMessage = false;
drawRoomMessage(curInv, _closeDataPtr);
break;
@ -1001,7 +993,6 @@ void LabEngine::processAltButton(uint16 &curInv, uint16 &lastInv, uint16 buttonI
eatMessages();
_alternate = false;
_anim->_doBlack = true;
_graphics->_doNotDrawMessage = false;
_mainDisplay = true;
// Sets the correct button list