diff options
| author | athrxx | 2019-03-30 16:20:35 +0100 |
|---|---|---|
| committer | athrxx | 2019-04-13 18:55:01 +0200 |
| commit | d56cea770bfa765acd8ed5df3015c35124b85d40 (patch) | |
| tree | eb3757bd13e8ab8d71ce3ab1a88c01a8f020e480 /engines/kyra/engine | |
| parent | 69f2e0caaa3b7257318f2e9943d233da45bfab80 (diff) | |
| download | scummvm-rg350-d56cea770bfa765acd8ed5df3015c35124b85d40.tar.gz scummvm-rg350-d56cea770bfa765acd8ed5df3015c35124b85d40.tar.bz2 scummvm-rg350-d56cea770bfa765acd8ed5df3015c35124b85d40.zip | |
KYRA: (EOB2/Amiga) - fix sequence dialogue field
Diffstat (limited to 'engines/kyra/engine')
| -rw-r--r-- | engines/kyra/engine/eobcommon.cpp | 9 | ||||
| -rw-r--r-- | engines/kyra/engine/kyra_rpg.cpp | 1 | ||||
| -rw-r--r-- | engines/kyra/engine/kyra_rpg.h | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp index 798bfb6a93..6990427f52 100644 --- a/engines/kyra/engine/eobcommon.cpp +++ b/engines/kyra/engine/eobcommon.cpp @@ -1588,7 +1588,6 @@ void EoBCoreEngine::initDialogueSequence() { _npcSequenceSub = -1; _txt->setWaitButtonMode(0); _dialogueField = true; - _dialogueLastBitmap[0] = 0; _txt->resetPageBreakString(); @@ -1618,7 +1617,7 @@ void EoBCoreEngine::initDialogueSequence() { void EoBCoreEngine::restoreAfterDialogueSequence() { _txt->allowPageBreak(false); - _dialogueField = false; + _dialogueField = _dialogueFieldAmiga = false; _dialogueLastBitmap[0] = 0; @@ -1850,9 +1849,13 @@ void EoBCoreEngine::displayParchment(int id) { } else { // display bitmap - id = -id - 1; static const uint8 x[] = { 0, 20, 0 }; static const uint8 y[] = { 0, 0, 96 }; + id = -id - 1; + + if (_flags.platform == Common::kPlatformAmiga) + _txt->setupField(9, 0); + drawSequenceBitmap("MAP", 0, x[id], y[id], 0); removeInputTop(); diff --git a/engines/kyra/engine/kyra_rpg.cpp b/engines/kyra/engine/kyra_rpg.cpp index 616402445d..a2f0460a45 100644 --- a/engines/kyra/engine/kyra_rpg.cpp +++ b/engines/kyra/engine/kyra_rpg.cpp @@ -120,6 +120,7 @@ KyraRpgEngine::KyraRpgEngine(OSystem *system, const GameFlags &flags) : KyraEngi memset(_lvlTempData, 0, sizeof(_lvlTempData)); _dialogueField = false; + _dialogueFieldAmiga = true; _environmentSfx = _environmentSfxVol = _envSfxDistThreshold = 0; _monsterStepCounter = _monsterStepMode = 0; diff --git a/engines/kyra/engine/kyra_rpg.h b/engines/kyra/engine/kyra_rpg.h index a6625e169e..af1d27f993 100644 --- a/engines/kyra/engine/kyra_rpg.h +++ b/engines/kyra/engine/kyra_rpg.h @@ -367,6 +367,7 @@ protected: virtual TextDisplayer_rpg *txt() { return _txt; } bool _dialogueField; + bool _dialogueFieldAmiga; const char *_dialogueButtonString[9]; const uint16 *_dialogueButtonPosX; |