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.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engines/kyra/screen_v2.cpp') diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index 57581fa750..c608c6e683 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -26,7 +26,8 @@ namespace Kyra { -Screen_v2::Screen_v2(KyraEngine_v1 *vm, OSystem *system) : Screen(vm, system), _wsaFrameAnimBuffer(0) { +Screen_v2::Screen_v2(KyraEngine_v1 *vm, OSystem *system, const ScreenDim *dimTable, const int dimTableSize) + : Screen(vm, system, dimTable, dimTableSize), _wsaFrameAnimBuffer(0) { _wsaFrameAnimBuffer = new uint8[1024]; assert(_wsaFrameAnimBuffer); } -- cgit v1.2.3