From 09146fba6eaad18a221990fd4362c93da34aaafb Mon Sep 17 00:00:00 2001
From: Walter van Niftrik
Date: Sun, 3 Apr 2016 13:51:22 +0200
Subject: ADL: Move restartGame() into opcode

---
 engines/adl/adl.cpp    | 4 +++-
 engines/adl/adl.h      | 1 -
 engines/adl/hires2.cpp | 6 ------
 engines/adl/hires2.h   | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'engines/adl')

diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 64e625d5ec..ba51b45f4f 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -1070,7 +1070,9 @@ int AdlEngine::o1_restart(ScriptEnv &e) {
 		_isRestarting = true;
 		_display->clear(0x00);
 		_display->updateHiResScreen();
-		restartGame();
+		_display->printString(_strings.pressReturn);
+		initState();
+		_display->printAsciiString(_strings.lineFeeds);
 		return -1;
 	}
 
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 831bf382b5..72353e4638 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -359,7 +359,6 @@ private:
 	virtual void runIntro() const { }
 	virtual void init() = 0;
 	virtual void initState() = 0;
-	virtual void restartGame() = 0;
 	virtual void drawItem(const Item &item, const Common::Point &pos) const = 0;
 	virtual void loadRoom(byte roomNr) = 0;
 	virtual void showRoom() = 0;
diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index 5a4e0e5fd6..943d7a6894 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -187,12 +187,6 @@ void HiRes2Engine::initState() {
 	}
 }
 
-void HiRes2Engine::restartGame() {
-	_display->printString(_strings.pressReturn);
-	initState();
-	_display->printAsciiString(_strings.lineFeeds);
-}
-
 Engine *HiRes2Engine_create(OSystem *syst, const AdlGameDescription *gd) {
 	return new HiRes2Engine(syst, gd);
 }
diff --git a/engines/adl/hires2.h b/engines/adl/hires2.h
index f2ffbf8744..a882b68114 100644
--- a/engines/adl/hires2.h
+++ b/engines/adl/hires2.h
@@ -59,7 +59,6 @@ private:
 	void runIntro() const;
 	void init();
 	void initState();
-	void restartGame();
 };
 
 } // End of namespace Adl
-- 
cgit v1.2.3