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_eob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 62d8bca201..7061ada4ac 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -36,7 +36,7 @@
 
 namespace Kyra {
 
-Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system), Screen_Rpg(vm, system, _screenDimTable, _screenDimTableCount) {
+Screen_EoB::Screen_EoB(EoBCoreEngine *vm, OSystem *system) : Screen(vm, system, _screenDimTable, _screenDimTableCount) {
 	_shapeFadeMode[0] = _shapeFadeMode[1] = 0;
 	_shapeFadeInternal = 0;
 	_fadeData = 0;
-- 
cgit v1.2.3