aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/text_lol.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-03-28 11:58:22 +0000
committerFlorian Kagerer2009-03-28 11:58:22 +0000
commit8875fdcdedc08710517295f770acaf6931912041 (patch)
treed69bf788a25363be80aa7557b054bba63abe9e09 /engines/kyra/text_lol.cpp
parent97abfc9181e0689aada9ee97cde5899e6b28c366 (diff)
downloadscummvm-rg350-8875fdcdedc08710517295f770acaf6931912041.tar.gz
scummvm-rg350-8875fdcdedc08710517295f770acaf6931912041.tar.bz2
scummvm-rg350-8875fdcdedc08710517295f770acaf6931912041.zip
LOL: - Level temp data now get stored in memory so you can now return to a level without everything being broken. Temp data isn't saved to disk. Since total memory requirement for storing this data won't exceed ~100kb I'd rather save memory in other places (like removing some screen page buffers)
- Implemented some more opcodes and fixed some bugs (You can now safely pick up coin pouches. The lamp seems to work fine, too). svn-id: r39719
Diffstat (limited to 'engines/kyra/text_lol.cpp')
-rw-r--r--engines/kyra/text_lol.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/kyra/text_lol.cpp b/engines/kyra/text_lol.cpp
index f7087cd846..9616596710 100644
--- a/engines/kyra/text_lol.cpp
+++ b/engines/kyra/text_lol.cpp
@@ -223,8 +223,10 @@ void TextDisplayer_LoL::printMessage(uint16 type, char *str, ...) {
_screen->setScreenDim(od);
- if (!(type & 0x8000) && soundEffect[type])
- _vm->sound()->playSoundEffect(soundEffect[type]);
+ if (!(type & 0x8000)) {
+ if (soundEffect[type])
+ _vm->sound()->playSoundEffect(soundEffect[type]);
+ }
_vm->_textColourFlag = type & 0x7fff;
_vm->_fadeText = false;
@@ -606,7 +608,7 @@ void TextDisplayer_LoL::textPageBreak() {
int x = ((dim->sx + dim->w) << 3) - 77;
int y = 0;
- if (_vm->_hideInventory && (_vm->_updateFlags & 2)) {
+ if (_vm->_needSceneRestore && (_vm->_updateFlags & 2)) {
if (_vm->_currentControlMode || !(_vm->_updateFlags & 2)) {
y = dim->sy + dim->h - 5;
} else {