ADL: Clean up Display class

4 files changed, 20 insertions, 27 deletions

diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index d2d8492a23..99267baa00 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -76,7 +76,7 @@ Common::Error AdlEngine::run() {
 	if (saveSlot >= 0) {
 		if (loadGameState(saveSlot).getCode() != Common::kNoError)
 			error("Failed to load save game from slot %i", saveSlot);
-		_display->setCursorPos(Common::Point(0, 23));
+		_display->moveCursorTo(Common::Point(0, 23));
 		_isRestoring = true;
 	} else {
 		runIntro();
@@ -472,7 +472,7 @@ bool AdlEngine::canLoadGameStateCurrently() {
 }
 
 void AdlEngine::clearScreen() {
-	_display->setMode(Display::kModeMixed);
+	_display->setMode(DISPLAY_MODE_MIXED);
 	_display->clear(0x00);
 }
 
@@ -744,7 +744,7 @@ Common::String AdlEngine::getLine() {
 
 		if ((byte)line[0] == ('\r' | 0x80)) {
 			textMode = !textMode;
-			_display->setMode(textMode ? Display::kModeText : Display::kModeMixed);
+			_display->setMode(textMode ? DISPLAY_MODE_TEXT : DISPLAY_MODE_MIXED);
 			continue;
 		}
 
diff --git a/engines/adl/display.cpp b/engines/adl/display.cpp
index 55166f4e30..a75b129dc8 100644
--- a/engines/adl/display.cpp
+++ b/engines/adl/display.cpp
@@ -90,7 +90,7 @@ static const byte font[64][5] = {
 };
 
 Display::Display() :
-		_mode(kModeText),
+		_mode(DISPLAY_MODE_TEXT),
 		_cursorPos(0),
 		_showCursor(false) {
 
@@ -135,9 +135,9 @@ Display::~Display() {
 }
 
 void Display::updateScreen() {
-	if (_mode == kModeText) {
+	if (_mode == DISPLAY_MODE_TEXT) {
 		g_system->copyRectToScreen(_textBufSurface->getPixels(), _textBufSurface->pitch, 0, 0, _textBufSurface->w, _textBufSurface->h);
-	} else if (_mode == kModeHires) {
+	} else if (_mode == DISPLAY_MODE_HIRES) {
 		g_system->copyRectToScreen(_frameBufSurface->getPixels(), _frameBufSurface->pitch, 0, 0, _frameBufSurface->w, _frameBufSurface->h);
 	} else {
 		g_system->copyRectToScreen(_frameBufSurface->getPixels(), _frameBufSurface->pitch, 0, 0, _frameBufSurface->w, _frameBufSurface->h - 4 * 8 * 2);
@@ -237,12 +237,6 @@ void Display::updateTextSurface() {
 		}
 }
 
-
-void Display::setCursorPos(Common::Point pos) {
-	_cursorPos = pos.y * 40 + pos.x;
-}
-
-
 void Display::home() {
 	memset(_textBuf, APPLECHAR(' '), kTextBufSize);
 	_cursorPos = 0;
diff --git a/engines/adl/display.h b/engines/adl/display.h
index 70dc42df63..40151c1c6a 100644
--- a/engines/adl/display.h
+++ b/engines/adl/display.h
@@ -41,20 +41,20 @@ namespace Adl {
 #define DISPLAY_WIDTH 280
 #define DISPLAY_HEIGHT 192
 
+enum DisplayMode {
+	DISPLAY_MODE_HIRES,
+	DISPLAY_MODE_TEXT,
+	DISPLAY_MODE_MIXED
+};
+
 #define APPLECHAR(C) ((char)((C) | 0x80))
 
 class Display {
 public:
-	enum Mode {
-		kModeHires,
-		kModeText,
-		kModeMixed
-	};
-
 	Display();
 	~Display();
 
-	void setMode(Mode mode) { _mode = mode; }
+	void setMode(DisplayMode mode) { _mode = mode; }
 	void updateScreen();
 	bool saveThumbnail(Common::WriteStream &out);
 
@@ -66,7 +66,6 @@ public:
 
 	// Text
 	void updateTextSurface();
-	void setCursorPos(Common::Point pos);
 	void home();
 	void moveCursorTo(const Common::Point &pos);
 	void moveCursorForward();
@@ -89,7 +88,7 @@ private:
 	void createFont();
 	void scrollUp();
 
-	Mode _mode;
+	DisplayMode _mode;
 
 	byte *_frameBuf;
 	Graphics::Surface *_frameBufSurface;
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index 04df01ecd4..6c369222b1 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -94,7 +94,7 @@ void HiRes1Engine::runIntro() {
 		error("Failed to open file");
 
 	file.seek(IDI_HR1_OFS_LOGO_0);
-	_display->setMode(Display::kModeHires);
+	_display->setMode(DISPLAY_MODE_HIRES);
 	_display->loadFrameBuffer(file);
 	_display->decodeFrameBuffer();
 	delay(4000);
@@ -102,7 +102,7 @@ void HiRes1Engine::runIntro() {
 	if (shouldQuit())
 		return;
 
-	_display->setMode(Display::kModeText);
+	_display->setMode(DISPLAY_MODE_TEXT);
 
 	Common::File basic;
 	if (!basic.open("MYSTERY.HELLO"))
@@ -130,7 +130,7 @@ void HiRes1Engine::runIntro() {
 	if (g_engine->shouldQuit())
 		return;
 
-	_display->setMode(Display::kModeMixed);
+	_display->setMode(DISPLAY_MODE_MIXED);
 
 	file.seek(IDI_HR1_OFS_GAME_OR_HELP);
 	str = readString(file);
@@ -156,7 +156,7 @@ void HiRes1Engine::runIntro() {
 	};
 
 	if (instructions) {
-		_display->setMode(Display::kModeText);
+		_display->setMode(DISPLAY_MODE_TEXT);
 		file.seek(IDI_HR1_OFS_INTRO_TEXT);
 
 		const uint pages[] = { 6, 6, 4, 5, 8, 7, 0 };
@@ -178,7 +178,7 @@ void HiRes1Engine::runIntro() {
 
 	file.close();
 
-	_display->setMode(Display::kModeMixed);
+	_display->setMode(DISPLAY_MODE_MIXED);
 
 	if (!file.open("ADVENTURE"))
 		error("Failed to open file");
@@ -298,7 +298,7 @@ void HiRes1Engine::restartGame() {
 }
 
 void HiRes1Engine::runGame() {
-	_display->setMode(Display::kModeMixed);
+	_display->setMode(DISPLAY_MODE_MIXED);
 
 	Common::File f;