libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup handling of the telescope cover combination; matches the original algorithm much better.

Browse Source 
svn-id: r48075
This commit is contained in:
Matthew Hoops 2010-02-17 04:20:19 +00:00
parent 85bce4611c
commit 2d03db8a20
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
engines/mohawk/riven_external.cpp
View File

@ -1251,7 +1251,7 @@ void RivenExternal::xpisland990_elevcombo(uint16 argc, uint16 *argv) {
// pelevcombo keeps count of how many buttons we have pressed in the correct order.
// When pelevcombo is 5, clicking the handle will show the video freeing Catherine.
if (argv[0] == getComboDigit(*_vm->matchVarToString("pcorrectorder"), *correctDigits))
if (*correctDigits < 5 && argv[0] == getComboDigit(*_vm->matchVarToString("pcorrectorder"), *correctDigits))
*correctDigits += 1;
else
*correctDigits = 0;
@ -1397,23 +1397,20 @@ void RivenExternal::xtexterior300_telescopeup(uint16 argc, uint16 *argv) {
}
void RivenExternal::xtisland390_covercombo(uint16 argc, uint16 *argv) {
// Called when clicking the telescope cover buttons. button is the button number (1...5).
uint32 *pressedButtons = _vm->matchVarToString("tcovercombo");
// Called when clicking the telescope cover buttons. argv[0] is the button number (1...5).
uint32 *correctDigits = _vm->matchVarToString("tcovercombo");
// We pressed a button! Yay! Add it to the queue.
*pressedButtons *= 10;
*pressedButtons += argv[0];
if (*correctDigits < 5 && argv[0] == getComboDigit(*_vm->matchVarToString("tcorrectorder"), *correctDigits))
*correctDigits += 1;
else
*correctDigits = 0;
if (*pressedButtons == *_vm->matchVarToString("tcorrectorder")) {
// If we have hit the correct 5 buttons in a row, activate the hotspot to open up the
// telescope cover.
if (*correctDigits == 5)
_vm->_hotspots[9].enabled = true;
} else {
else
_vm->_hotspots[9].enabled = false;
// Set the buttons to the last one pressed if we've
// pressed more than 5 buttons.
if (*pressedButtons > 55555)
*pressedButtons = argv[0];
}
}
// Atrus' Journal and Trap Book are added to inventory