From 487e73bd218775dec22818477ad75dd230d97052 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 26 Dec 2011 19:27:20 +0100
Subject: KYRA: Merge Screen_Rpg with Screen (for now).

This should(!) fix ARM compilation issues due to virtual inheritance.
---
 engines/kyra/screen_mr.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'engines/kyra/screen_mr.h')

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);
-- 
cgit v1.2.3