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/lol.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/lol.cpp')
| -rw-r--r-- | engines/kyra/lol.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index d90b5c9523..01b1bdf065 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -361,10 +361,6 @@ Screen *LoLEngine::screen() { return _screen; } -Screen_Rpg *LoLEngine::screen_rpg() { - return _screen; -} - GUI *LoLEngine::gui() const { return _gui; } |