diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/klists.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/frameout.cpp | 39 |
2 files changed, 25 insertions, 18 deletions
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp index 37f60d2830..9a63b39f18 100644 --- a/engines/sci/engine/klists.cpp +++ b/engines/sci/engine/klists.cpp @@ -473,6 +473,10 @@ reg_t kListAt(EngineState *s, int argc, reg_t *argv) { List *list = s->_segMan->lookupList(argv[0]); reg_t curAddress = list->first; + if (list->first.isNull()) { + warning("kListAt tried to reference empty list (%04x:%04x)", PRINT_REG(argv[0])); + return NULL_REG; + } Node *curNode = s->_segMan->lookupNode(curAddress); reg_t curObject = curNode->value; int16 listIndex = argv[1].toUint16(); diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index f8f44ca1c4..f6202ec10b 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -233,26 +233,29 @@ void GfxFrameout::kernelFrameout() { // Most likely a text entry // This draws text the "SCI0-SCI11" way. In SCI2, text is prerendered in kCreateTextBitmap // TODO: rewrite this the "SCI2" way (i.e. implement the text buffer to draw inside kCreateTextBitmap) - Kernel *kernel = ((SciEngine *)g_engine)->getKernel(); - if (lookup_selector(_segMan, itemEntry->object, kernel->_selectorCache.text, NULL, NULL) == kSelectorVariable) { - Common::String text = _segMan->getString(GET_SEL32(_segMan, itemEntry->object, SELECTOR(text))); - int16 fontRes = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(font)); - GfxFont *font = new GfxFont(_resMan, _screen, fontRes); - bool dimmed = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(dimmed)); - uint16 foreColor = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(fore)); - uint16 curX = itemEntry->x; - uint16 curY = itemEntry->y; - for (uint32 i = 0; i < text.size(); i++) { - // TODO: proper text splitting... this is a hack - if ((text[i] == ' ' && i > 0 && text[i - i] == ' ') || text[i] == '\n' || - (curX + font->getCharWidth(text[i]) > _screen->getWidth())) { - curY += font->getCharHeight('A'); - curX = itemEntry->x; + // This doesn't work for SCI2.1 games... + if (getSciVersion() == SCI_VERSION_2) { + Kernel *kernel = ((SciEngine *)g_engine)->getKernel(); + if (lookup_selector(_segMan, itemEntry->object, kernel->_selectorCache.text, NULL, NULL) == kSelectorVariable) { + Common::String text = _segMan->getString(GET_SEL32(_segMan, itemEntry->object, SELECTOR(text))); + int16 fontRes = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(font)); + GfxFont *font = new GfxFont(_resMan, _screen, fontRes); + bool dimmed = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(dimmed)); + uint16 foreColor = GET_SEL32V(_segMan, itemEntry->object, SELECTOR(fore)); + uint16 curX = itemEntry->x; + uint16 curY = itemEntry->y; + for (uint32 i = 0; i < text.size(); i++) { + // TODO: proper text splitting... this is a hack + if ((text[i] == ' ' && i > 0 && text[i - i] == ' ') || text[i] == '\n' || + (curX + font->getCharWidth(text[i]) > _screen->getWidth())) { + curY += font->getCharHeight('A'); + curX = itemEntry->x; + } + font->draw(text[i], curY, curX, foreColor, dimmed); + curX += font->getCharWidth(text[i]); } - font->draw(text[i], curY, curX, foreColor, dimmed); - curX += font->getCharWidth(text[i]); + delete font; } - delete font; } } listIterator++; |