diff options
| author | Johannes Schickel | 2008-01-27 15:53:09 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-01-27 15:53:09 +0000 |
| commit | dd3a8672be7ef0b2e967ec40b09fc1f44a1cb252 (patch) | |
| tree | b67babc8bd8ff3d755bea5dd6c247257e390dae7 | |
| parent | fec6e22cc92358b08d4e0f62e5db18119e5f2e6d (diff) | |
| download | scummvm-rg350-dd3a8672be7ef0b2e967ec40b09fc1f44a1cb252.tar.gz scummvm-rg350-dd3a8672be7ef0b2e967ec40b09fc1f44a1cb252.tar.bz2 scummvm-rg350-dd3a8672be7ef0b2e967ec40b09fc1f44a1cb252.zip | |
Fix for some problems introduced (like wrong text display) with last commit.
svn-id: r30654
| -rw-r--r-- | engines/kyra/kyra.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_v1.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 4 | ||||
| -rw-r--r-- | engines/kyra/script_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/text_v2.cpp | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 8ede5e21b0..faa8a83e7e 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -79,6 +79,8 @@ KyraEngine::KyraEngine(OSystem *system, const GameFlags &flags) } int KyraEngine::init() { + registerDefaultSettings(); + // Setup mixer if (!_mixer->isReady()) warning("Sound initialization failed."); diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index c835437cc5..cb65783558 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -264,7 +264,6 @@ int KyraEngine_v1::init() { assert(_movFacingTable); _movFacingTable[0] = 8; - registerDefaultSettings(); readSettings(); _skipFlag = false; diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 7c6bb0429d..496a7bd709 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -131,6 +131,8 @@ int KyraEngine_v2::init() { setupTimers(); + readSettings(); + _screen->loadFont(_screen->FID_6_FNT, "6.FNT"); _screen->loadFont(_screen->FID_8_FNT, "8FAT.FNT"); _screen->loadFont(_screen->FID_GOLDFONT_FNT, "GOLDFONT.FNT"); @@ -524,7 +526,7 @@ void KyraEngine_v2::updateWithText() { restorePage3(); drawAnimObjects(); - if (1/*textEnabled()*/ && _chatText) { + if (textEnabled() && _chatText) { int pageBackUp = _screen->_curPage; _screen->_curPage = 2; objectChatPrintText(_chatText, _chatObject); diff --git a/engines/kyra/script_v2.cpp b/engines/kyra/script_v2.cpp index eed7339dd7..190177fcb1 100644 --- a/engines/kyra/script_v2.cpp +++ b/engines/kyra/script_v2.cpp @@ -760,7 +760,7 @@ int KyraEngine_v2::o2_zanthiaChat(ScriptState *script) { int KyraEngine_v2::o2_isVoiceEnabled(ScriptState *script) { debugC(3, kDebugLevelScriptFuncs, "o2_isVoiceEnabled(%p) ()", (const void *)script); - return 1/*voiceEnabled()*/; + return speechEnabled() ? 1 : 0; } int KyraEngine_v2::o2_isVoicePlaying(ScriptState *script) { diff --git a/engines/kyra/text_v2.cpp b/engines/kyra/text_v2.cpp index e4c35c288f..24e146a990 100644 --- a/engines/kyra/text_v2.cpp +++ b/engines/kyra/text_v2.cpp @@ -126,7 +126,7 @@ int KyraEngine_v2::chatGetType(const char *str) { } int KyraEngine_v2::chatCalcDuration(const char *str) { - return MIN<int>(strlen(str) << 3, 120); + return MAX<int>(strlen(str) << 3, 120); } void KyraEngine_v2::objectChat(const char *str, int object, int vocHigh, int vocLow) { |