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/lol.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'engines/kyra/lol.cpp')

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