ADL: Move restartGame() into opcode

scummvm · Jun 6, 2016 · 09146fb · 09146fb
1 parent 97168fa
commit 09146fb
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git 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
@@ -359,7 +359,6 @@ friend class Console;
 	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
@@ -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
@@ -59,7 +59,6 @@ class HiRes2Engine : public AdlEngine_v2 {
 	void runIntro() const;
 	void init();
 	void initState();
-	void restartGame();
 };
 
 } // End of namespace Adl