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_mr.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/screen_mr.h')
-rw-r--r-- | engines/kyra/screen_mr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/engines/kyra/screen_mr.h b/engines/kyra/screen_mr.h index 0cb3240954..e10afcc5d2 100644 --- a/engines/kyra/screen_mr.h +++ b/engines/kyra/screen_mr.h @@ -34,10 +34,6 @@ public: Screen_MR(KyraEngine_MR *vm, OSystem *system); ~Screen_MR(); - void setScreenDim(int dim); - const ScreenDim *getScreenDim(int dim); - int screenDimTableCount() const { return _screenDimTableCount; } - int getLayer(int x, int y); byte getShapeFlag1(int x, int y); |