From ec2c7cfefa2daeb760cabbd7ded827377bb1121e Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 7 Jul 2009 14:22:39 +0000
Subject: Adapt KYRA to use the new Graphics::FontSJIS code.

svn-id: r42222
---
 engines/kyra/screen.h | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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

diff --git a/engines/kyra/screen.h b/engines/kyra/screen.h
index 956bd7107e..a7a7efa7ca 100644
--- a/engines/kyra/screen.h
+++ b/engines/kyra/screen.h
@@ -35,6 +35,10 @@
 
 class OSystem;
 
+namespace Graphics {
+class FontSJIS;
+} // end of namespace Graphics
+
 namespace Kyra {
 
 typedef Common::Functor0<void> UpdateFunctor;
@@ -360,11 +364,6 @@ protected:
 	void drawCharANSI(uint8 c, int x, int y);
 	void drawCharSJIS(uint16 c, int x, int y);
 
-	enum {
-		SJIS_CHARSIZE = 18,
-		SJIS_CHARS = 8192
-	};
-
 	int16 encodeShapeAndCalculateSize(uint8 *from, uint8 *to, int size);
 
 	template<bool noXor> static void wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src);
@@ -377,10 +376,7 @@ protected:
 	bool _useSJIS;
 	bool _use16ColorMode;
 
-	uint8 *_sjisFontData;
-	uint8 *_sjisTempPage;
-	uint8 *_sjisTempPage2;
-	uint8 *_sjisSourceChar;
+	Graphics::FontSJIS *_sjisFont;
 	uint8 _sjisInvisibleColor;
 
 	Palette *_screenPalette;
-- 
cgit v1.2.3