MORTEVIELLE: Implemented a screen surface class to hold all the graphics functionality.

This includes moving the already created pixel and character functions into it, as well as a new method for drawing decoded graphic images.

1 files changed, 2 insertions, 11 deletions

diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 0e72090ec3..bcd6f666d0 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -29,6 +29,7 @@
 #include "engines/engine.h"
 #include "common/error.h"
 #include "graphics/surface.h"
+#include "mortevielle/graphics.h"
 
 namespace Mortevielle {
 
@@ -42,10 +43,6 @@ enum {
 #define MORT_DAT_REQUIRED_VERSION 1
 #define MORT_DAT "mort.dat"
 
-#define FONT_WIDTH 8
-#define FONT_HEIGHT 6
-#define FONT_NUM_CHARS 121
-
 class MortevielleEngine : public Engine {
 private:
 	const ADGameDescription *_gameDescription;
@@ -54,19 +51,13 @@ private:
 	Common::ErrorCode loadMortDat();
 	void loadFont(Common::File &f);
 public:
-	Graphics::Surface _screenSurface;
-	byte _fontData[FONT_NUM_CHARS * FONT_HEIGHT];
+	ScreenSurface _screenSurface;
 public:
 	MortevielleEngine(OSystem *system, const ADGameDescription *gameDesc);
 	~MortevielleEngine();
 	virtual bool hasFeature(EngineFeature f) const;
 	virtual Common::Error run();
 	uint32 getGameFlags() const;
-
-	void updateScreen();
-	void writeCharacter(const Common::Point &pt,
-		unsigned char ch, int palIndex, Graphics::Surface *surface = NULL);
-	void setPixel(const Common::Point &pt, int palIndex, Graphics::Surface *surface = NULL);
 };
 
 extern MortevielleEngine *g_vm;