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.h | |
| 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.h')
| -rw-r--r-- | engines/kyra/lol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h index 3a6486b30e..eeaa1b51ad 100644 --- a/engines/kyra/lol.h +++ b/engines/kyra/lol.h @@ -279,7 +279,6 @@ public: virtual void initKeymap(); Screen *screen(); - Screen_Rpg *screen_rpg(); GUI *gui() const; private: |