diff options
| author | Walter van Niftrik | 2016-04-03 13:51:22 +0200 |
|---|---|---|
| committer | Walter van Niftrik | 2016-06-06 20:35:49 +0200 |
| commit | 09146fba6eaad18a221990fd4362c93da34aaafb (patch) | |
| tree | d7f45e3eeb6e8ff45dba2141f91ac1804cd7e02c | |
| parent | 97168fa200e6e7a437b9e68e6ebc1438c520a4f5 (diff) | |
| download | scummvm-rg350-09146fba6eaad18a221990fd4362c93da34aaafb.tar.gz scummvm-rg350-09146fba6eaad18a221990fd4362c93da34aaafb.tar.bz2 scummvm-rg350-09146fba6eaad18a221990fd4362c93da34aaafb.zip | |
ADL: Move restartGame() into opcode
| -rw-r--r-- | engines/adl/adl.cpp | 4 | ||||
| -rw-r--r-- | engines/adl/adl.h | 1 | ||||
| -rw-r--r-- | engines/adl/hires2.cpp | 6 | ||||
| -rw-r--r-- | engines/adl/hires2.h | 1 |
4 files changed, 3 insertions, 9 deletions
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 |