diff options
| -rw-r--r-- | engines/illusions/bbdou/scriptopcodes_bbdou.cpp | 2 | ||||
| -rw-r--r-- | engines/illusions/duckman/duckman_specialcode.cpp | 2 | ||||
| -rw-r--r-- | engines/illusions/duckman/menusystem_duckman.cpp | 5 | ||||
| -rw-r--r-- | engines/illusions/menusystem.cpp | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp index 764dda9d38..09395831ea 100644 --- a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp +++ b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp @@ -676,8 +676,6 @@ void ScriptOpcodes_BBDOU::opDisplayMenu(ScriptThread *scriptThread, OpCall &opCa } void ScriptOpcodes_BBDOU::opSwitchMenuChoice(ScriptThread *scriptThread, OpCall &opCall) { -_vm->_menuChoiceOfs = 88; // DEBUG Chose "Start game" - opCall._deltaOfs += _vm->_menuChoiceOfs; } diff --git a/engines/illusions/duckman/duckman_specialcode.cpp b/engines/illusions/duckman/duckman_specialcode.cpp index c420bd500c..dd4e68916a 100644 --- a/engines/illusions/duckman/duckman_specialcode.cpp +++ b/engines/illusions/duckman/duckman_specialcode.cpp @@ -72,8 +72,10 @@ void DuckmanSpecialCode::init() { SPECIAL(0x00160003, spcResetChinesePuzzle); SPECIAL(0x00160004, spcAddChinesePuzzleAnswer); SPECIAL(0x00160005, spcOpenInventory); + SPECIAL(0x00160007, spcPutBackInventoryItem); SPECIAL(0x00160008, spcClearInventorySlot); + SPECIAL(0x0016000A, spcAddPropertyTimer); SPECIAL(0x0016000B, spcSetPropertyTimer); SPECIAL(0x0016000C, spcRemovePropertyTimer); diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp index 84f7974d95..b4ccee903d 100644 --- a/engines/illusions/duckman/menusystem_duckman.cpp +++ b/engines/illusions/duckman/menusystem_duckman.cpp @@ -222,8 +222,7 @@ typedef struct InventoryMenuItem { uint32 propertyId; } InventoryMenuItem; -static const InventoryMenuItem kDebugInventoryItems[21] = -{ +static const InventoryMenuItem kDebugInventoryItems[21] = { { "Pick-up Book", 262212, 393231, 917519 }, { "Bucket and Squeegee", 262314, 393233, 917599 }, { "Cardboard Cut Out", 262219, 393264, 917573 }, @@ -398,7 +397,7 @@ void MenuActionUpdateSlider::setSliderValue(uint8 newValue) { _menuItem->setText(text); _menuSystem->redrawMenuText(menu); - switch(_type) { + switch (_type) { case SFX : _vm->_soundMan->setSfxVolume(newValue * (256/15)); break; case MUSIC : _vm->_soundMan->setMusicVolume(newValue * (256/15)); break; case VOICE : _vm->_soundMan->setSpeechVolume(newValue * (256/15)); break; diff --git a/engines/illusions/menusystem.cpp b/engines/illusions/menusystem.cpp index 816b17d14e..b33da1333b 100644 --- a/engines/illusions/menusystem.cpp +++ b/engines/illusions/menusystem.cpp @@ -257,7 +257,7 @@ void BaseMenuSystem::placeActorHoverBackground() { WidthHeight textInfoDimensions; _vm->_screenText->getTextInfoDimensions(textInfoDimensions); - if ( _activeMenu->_backgroundColor && _activeMenu->_borderColor != _activeMenu->_backgroundColor) + if (_activeMenu->_backgroundColor && _activeMenu->_borderColor != _activeMenu->_backgroundColor) textInfoDimensions._width -= 6; WidthHeight frameDimensions; @@ -567,7 +567,7 @@ bool BaseMenuSystem::calcMenuItemTextPositionAtPoint(Common::Point pt, int &offs FontResource *font = _vm->_dict->findFont(_activeMenu->_fontId); uint curX = 0; - for (int i=0; i < text.size(); i++) { + for (int i = 0; i < text.size(); i++) { int16 w = font->getCharInfo(text[i])->_width; if (x >= curX && x <= curX + w) { offset = i; |