diff options
Diffstat (limited to 'engines/mortevielle')
| -rw-r--r-- | engines/mortevielle/menu.cpp | 21 | ||||
| -rw-r--r-- | engines/mortevielle/sound.cpp | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp index 14fc8d4084..7979e3ce7f 100644 --- a/engines/mortevielle/menu.cpp +++ b/engines/mortevielle/menu.cpp @@ -56,7 +56,26 @@ Menu::Menu(MortevielleEngine *vm) { _opcodePlace = _opcodeOpen = _opcodeTake = _opcodeLook = OPCODE_NONE; _opcodeSmell = _opcodeSound = _opcodeLeave = _opcodeLift = OPCODE_NONE; _opcodeTurn = _opcodeSHide = _opcodeSSearch = _opcodeSRead = OPCODE_NONE; - _opcodeSPut = _opcodeSLook = OPCODE_NONE; + _opcodeSPut = _opcodeSLook = _msg3 = _msg4 = OPCODE_NONE; + + _menuActive = false; + _menuSelected = false; + _multiTitle = false; + _menuDisplayed = false; + for (int i = 0; i < 9; i++) { + _discussMenu[i]._menuId = MENU_NONE; + _discussMenu[i]._actionId = 0; + _inventoryMenu[i]._menuId = MENU_NONE; + _inventoryMenu[i]._actionId = 0; + } + for (int i = 0; i < 8; i++) { + _moveMenu[i]._menuId = MENU_NONE; + _moveMenu[i]._actionId = 0; + } + for (int i = 0; i < 12; i++) { + _actionMenu[i]._menuId = MENU_NONE; + _actionMenu[i]._actionId = 0; + } } void Menu::readVerbNums(Common::File &f, int dataSize) { diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp index c39c8e7024..db1f7578f1 100644 --- a/engines/mortevielle/sound.cpp +++ b/engines/mortevielle/sound.cpp @@ -73,6 +73,8 @@ SoundManager::SoundManager(MortevielleEngine *vm, Audio::Mixer *mixer) { _queue[i]._rep = 0; } _buildingSentence = false; + _ptr_oct = 0; + _cfiphBuffer = nullptr; } SoundManager::~SoundManager() { |