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/screen_eob.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/screen_eob.cpp')
| -rw-r--r-- | engines/kyra/screen_eob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp index 62d8bca201..7061ada4ac 100644 --- a/engines/kyra/screen_eob.cpp +++ b/engines/kyra/screen_eob.cpp @@ -36,7 +36,7 @@ namespace Kyra { -Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system), Screen_Rpg(vm, system, _screenDimTable, _screenDimTableCount) { +Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system, _screenDimTable, _screenDimTableCount) { _shapeFadeMode[0] = _shapeFadeMode[1] = 0; _shapeFadeInternal = 0; _fadeData = 0; |