From 51f69666562c86708466c85485ef2fe062f9af23 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 25 Jul 2013 10:10:09 +0200
Subject: MORTEVIELLE: Use a specific buffer instead of _mem for the right
 frame

---
 engines/mortevielle/mortevielle.h | 3 +--
 engines/mortevielle/utils.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/mortevielle')

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 91a65c1e0c..ae35b20554 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -67,7 +67,6 @@ const int kAdrMusic = 0x5000;
 
 const int kAdrCompMusicBuf1 = 0x7414;
 const int kAdrCompMusicBuf2 = 0x3800;
-const int kAdrRightFramePic = 0x73A2;
 
 #define ord(v) ((int) v)
 #define chr(v) ((unsigned char) v)
@@ -477,7 +476,7 @@ public:
 	// TODO: Replace the following with proper implementations, or refactor out the code using them
 	byte _mem[65536 * 16];
 	byte *_curPict;
-
+	byte _rightFramePict[1664];
 	Debugger _debugger;
 	ScreenSurface _screenSurface;
 	PaletteManager _paletteManager;
diff --git a/engines/mortevielle/utils.cpp b/engines/mortevielle/utils.cpp
index a8394f5015..36b2d613ca 100644
--- a/engines/mortevielle/utils.cpp
+++ b/engines/mortevielle/utils.cpp
@@ -2254,7 +2254,7 @@ void MortevielleEngine::drawRightFrame() {
 		_curPict[14] = 15;
 
 	_mouse.hideMouse();
-	displayPicture(&_mem[kAdrRightFramePic * 16], 0, 0);
+	displayPicture(_rightFramePict, 0, 0);
 	_mouse.showMouse();
 }
 
@@ -2570,7 +2570,7 @@ void MortevielleEngine::adzon() {
 	if (!f.open("dec.mor"))
 		error("Missing file - dec.mor");
 
-	f.read(&_mem[kAdrRightFramePic * 16], 1664);
+	f.read(_rightFramePict, 1664);
 	f.close();
 }
 
-- 
cgit v1.2.3