diff options
| author | Filippos Karapetis | 2008-12-29 17:30:29 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-29 17:30:29 +0000 |
| commit | 9a5f45a40c433cce2965eb4fc567296fb32ab6cc (patch) | |
| tree | e970bba683f1ebd7e73088fba48a14ed6a06bf5a /engines/saga/interface.cpp | |
| parent | 842af1ee4aa355da0b99daeb82b6ea9b2eb4d698 (diff) | |
| download | scummvm-rg350-9a5f45a40c433cce2965eb4fc567296fb32ab6cc.tar.gz scummvm-rg350-9a5f45a40c433cce2965eb4fc567296fb32ab6cc.tar.bz2 scummvm-rg350-9a5f45a40c433cce2965eb4fc567296fb32ab6cc.zip | |
- IHNM Mac loads correctly again
- Removed isBigEndian from GameSoundInfo
- Removed GF_BIG_ENDIAN_DATA
- Stopped loading the options panel for non-interactive ITE demos (it doesn't exist)
- Fixed crash when exiting from non-interactive ITE demos
svn-id: r35615
Diffstat (limited to 'engines/saga/interface.cpp')
| -rw-r--r-- | engines/saga/interface.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 4cd6cf4d7d..8d26e83fc2 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -166,13 +166,19 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) { free(resource); // Option panel - _optionPanel.buttons = _vm->getDisplayInfo().optionPanelButtons; - _optionPanel.buttonsCount = _vm->getDisplayInfo().optionPanelButtonsCount; + if (!(_vm->getFeatures() & GF_NON_INTERACTIVE)) { + _optionPanel.buttons = _vm->getDisplayInfo().optionPanelButtons; + _optionPanel.buttonsCount = _vm->getDisplayInfo().optionPanelButtonsCount; - _vm->_resource->loadResource(_interfaceContext, _vm->getResourceDescription()->optionPanelResourceId, resource, resourceLength); - _vm->decodeBGImage(resource, resourceLength, &_optionPanel.image, - &_optionPanel.imageLength, &_optionPanel.imageWidth, &_optionPanel.imageHeight); - free(resource); + _vm->_resource->loadResource(_interfaceContext, _vm->getResourceDescription()->optionPanelResourceId, resource, resourceLength); + _vm->decodeBGImage(resource, resourceLength, &_optionPanel.image, + &_optionPanel.imageLength, &_optionPanel.imageWidth, &_optionPanel.imageHeight); + free(resource); + } else { + _optionPanel.buttons = NULL; + _optionPanel.buttonsCount = 0; + _optionPanel.sprites.spriteCount = 0; + } // Quit panel if (_vm->getGameId() == GID_IHNM) { |