From 60330556ff5bf319db7815e6f3c635bc98edecc5 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Sat, 17 Dec 2011 22:39:11 +0100
Subject: KYRA: (EOB/LOL) - move eob/lol specific screen code to new class

---
 engines/kyra/screen_v2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h
index d85c762038..f50c81e912 100644
--- a/engines/kyra/screen_v2.h
+++ b/engines/kyra/screen_v2.h
@@ -28,7 +28,7 @@
 
 namespace Kyra {
 
-class Screen_v2 : public Screen {
+class Screen_v2 : virtual public Screen {
 public:
 	Screen_v2(KyraEngine_v1 *vm, OSystem *system);
 	~Screen_v2();
-- 
cgit v1.2.3


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_v2.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/engines/kyra/screen_v2.h b/engines/kyra/screen_v2.h
index f50c81e912..f84c923128 100644
--- a/engines/kyra/screen_v2.h
+++ b/engines/kyra/screen_v2.h
@@ -28,9 +28,9 @@
 
 namespace Kyra {
 
-class Screen_v2 : virtual public Screen {
+class Screen_v2 : public Screen {
 public:
-	Screen_v2(KyraEngine_v1 *vm, OSystem *system);
+	Screen_v2(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize);
 	~Screen_v2();
 
 	// screen page handling
-- 
cgit v1.2.3