diff options
author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
---|---|---|
committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/screen_mr.h | |
parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip |
Merge remote branch 'upstream/master' into pegasus
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); |