diff options
| author | Johannes Schickel | 2011-12-26 19:27:20 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 19:32:05 +0100 |
| commit | 487e73bd218775dec22818477ad75dd230d97052 (patch) | |
| tree | bd83a597ab7c48358f77212562bcf32cb1b7a286 /engines/kyra/text_rpg.cpp | |
| parent | c2a94132c8adf8bec5914ca6fa2e312248e1c2bd (diff) | |
| download | scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.tar.gz scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.tar.bz2 scummvm-rg350-487e73bd218775dec22818477ad75dd230d97052.zip | |
KYRA: Merge Screen_Rpg with Screen (for now).
This should(!) fix ARM compilation issues due to virtual inheritance.
Diffstat (limited to 'engines/kyra/text_rpg.cpp')
| -rw-r--r-- | engines/kyra/text_rpg.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/kyra/text_rpg.cpp b/engines/kyra/text_rpg.cpp index ca1fd04269..78206d3a06 100644 --- a/engines/kyra/text_rpg.cpp +++ b/engines/kyra/text_rpg.cpp @@ -24,7 +24,6 @@ #if defined(ENABLE_EOB) || defined(ENABLE_LOL) #include "kyra/kyra_rpg.h" -#include "kyra/screen_rpg.h" #include "kyra/timer.h" #include "common/system.h" @@ -35,7 +34,7 @@ enum { kEoBTextBufferSize = 2048 }; -TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen_Rpg *scr) : _vm(engine), _screen(scr), +TextDisplayer_rpg::TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr) : _vm(engine), _screen(scr), _lineCount(0), _printFlag(false), _lineWidth(0), _numCharsTotal(0), _allowPageBreak(true), _numCharsLeft(0), _numCharsPrinted(0), _sjisLineBreakFlag(false), _waitButtonMode(1) { |