diff options
| author | Eugene Sandulenko | 2005-08-13 01:05:59 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-08-13 01:05:59 +0000 |
| commit | 8242e3e2bce9b6570854826af2b1d491cad8c3e4 (patch) | |
| tree | fabd8a3687f663ed40f2c6d89b47e5e2a118f33d | |
| parent | 644209261691f8850d0c8f8cd7d6c941c5ec0cb6 (diff) | |
| download | scummvm-rg350-8242e3e2bce9b6570854826af2b1d491cad8c3e4.tar.gz scummvm-rg350-8242e3e2bce9b6570854826af2b1d491cad8c3e4.tar.bz2 scummvm-rg350-8242e3e2bce9b6570854826af2b1d491cad8c3e4.zip | |
Fixe bug #1257869 "ITE: Crash when viewing the map"
svn-id: r18673
| -rw-r--r-- | saga/image.cpp | 2 | ||||
| -rw-r--r-- | saga/interface.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/saga/image.cpp b/saga/image.cpp index 79550e24ea..ed2320ef10 100644 --- a/saga/image.cpp +++ b/saga/image.cpp @@ -58,7 +58,7 @@ int SagaEngine::decodeBGImage(const byte *image_data, size_t image_size, size_t out_buf_len; if (image_size <= SAGA_IMAGE_DATA_OFFSET) { - error("decodeBGImage() Image size is way too small"); + error("decodeBGImage() Image size is way too small (%d)", image_size); } MemoryReadStreamEndian readS(image_data, image_size, isBigEndian()); diff --git a/saga/interface.cpp b/saga/interface.cpp index 46e2941c87..88ce03b5fe 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -570,7 +570,7 @@ void Interface::draw() { drawStatusBar(); - if (_panelMode == kPanelMain) { + if (_panelMode == kPanelMain || _panelMode == kPanelMap) { _mainPanel.getRect(rect); backBuffer->blit(rect, _mainPanel.image); @@ -2129,7 +2129,8 @@ void Interface::mapPanelShow() { rect.left = rect.top = 0; - _vm->_resource->loadResource(_interfaceContext, RID_ITE_TYCHO_MAP, resource, resourceLength); + _vm->_resource->loadResource(_interfaceContext, + _vm->_resource->convertResourceId(RID_ITE_TYCHO_MAP), resource, resourceLength); if (resourceLength == 0) { error("Interface::mapPanelShow() unable to load Tycho map resource"); } |