aboutsummaryrefslogtreecommitdiff
path: root/engines/toltecs/screen.cpp
diff options
context:
space:
mode:
authorBenjamin Haisch2011-04-11 11:36:53 +0000
committerWillem Jan Palenstijn2011-11-20 22:43:10 +0100
commitacd4d4098f880aa639895f3cfecbac0764999112 (patch)
treebbd16a9dc5c7006d738fa183e0e3b580cff664da /engines/toltecs/screen.cpp
parente1fefefff2f2adc26cff5cc8f0c62cb210b31415 (diff)
downloadscummvm-rg350-acd4d4098f880aa639895f3cfecbac0764999112.tar.gz
scummvm-rg350-acd4d4098f880aa639895f3cfecbac0764999112.tar.bz2
scummvm-rg350-acd4d4098f880aa639895f3cfecbac0764999112.zip
TOLTECS: Fix bugs
- Save scene parameters before playing a movie and restore them afterwards (fixes crash) - Fix text disappearing too fast - Implement script function sfGetCameraChanged - Replace nop script functions with stubs which print debug info when called - Some cleanup, remove obsolete TODOs
Diffstat (limited to 'engines/toltecs/screen.cpp')
-rw-r--r--engines/toltecs/screen.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/toltecs/screen.cpp b/engines/toltecs/screen.cpp
index b2979b7b05..4eda8f643f 100644
--- a/engines/toltecs/screen.cpp
+++ b/engines/toltecs/screen.cpp
@@ -125,7 +125,7 @@ void Screen::drawGuiImage(int16 x, int16 y, uint resIndex) {
int16 height = imageData[3];
int16 workWidth = width, workHeight = height;
imageData += headerSize;
-
+
byte *dest = _frontScreen + x + (y + _vm->_cameraHeight) * 640;
//debug(0, "Screen::drawGuiImage() x = %d; y = %d; w = %d; h = %d; resIndex = %d", x, y, width, height, resIndex);
@@ -444,9 +444,8 @@ void Screen::updateTalkText(int16 slotIndex, int16 slotOffset) {
}
int16 textDurationMultiplier = item->duration + 8;
- // TODO: Check sound/text flags
- if (*textData == 0xFE) {
- //textDurationMultiplier += 100;
+ if (_vm->_doSpeech && *textData == 0xFE) {
+ textDurationMultiplier += 100;
}
item->duration = 4 * textDurationMultiplier * durationModifier;
@@ -478,7 +477,8 @@ void Screen::addTalkTextItemsToRenderQueue() {
if (item->fontNum == -1 || item->duration == 0)
continue;
- item->duration -= _vm->_counter01;
+ //item->duration -= _vm->_counter01;
+ item->duration--;
if (item->duration < 0)
item->duration = 0;