ADL: Load line feeds string

5 files changed, 12 insertions, 4 deletions

diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 1b6bf6a344..64e625d5ec 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -552,10 +552,10 @@ Common::Error AdlEngine::run() {
 	} else {
 		runIntro();
 		initState();
+		_display->printAsciiString(_strings.lineFeeds);
 	}
 
 	_display->setMode(DISPLAY_MODE_MIXED);
-	_display->printAsciiString("\r\r\r\r\r");
 
 	while (1) {
 		uint verb = 0, noun = 0;
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 18b57ed32a..831bf382b5 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -339,6 +339,7 @@ protected:
 		Common::String nounError;
 		Common::String playAgain;
 		Common::String pressReturn;
+		Common::String lineFeeds;
 	} _strings;
 
 	struct {
diff --git a/engines/adl/hires1.cpp b/engines/adl/hires1.cpp
index e0f7574918..07656253ef 100644
--- a/engines/adl/hires1.cpp
+++ b/engines/adl/hires1.cpp
@@ -156,6 +156,7 @@ void HiRes1Engine::init() {
 	_strings.nounError = readStringAt(*stream, IDI_HR1_OFS_STR_NOUN_ERROR);
 	_strings.playAgain = readStringAt(*stream, IDI_HR1_OFS_STR_PLAY_AGAIN);
 	_strings.pressReturn = readStringAt(*stream, IDI_HR1_OFS_STR_PRESS_RETURN);
+	_strings.lineFeeds = readStringAt(*stream, IDI_HR1_OFS_STR_LINE_FEEDS);
 
 	// Set message IDs
 	_messageIds.cantGoThere = IDI_HR1_MSG_CANT_GO_THERE;
@@ -258,10 +259,9 @@ void HiRes1Engine::initState() {
 }
 
 void HiRes1Engine::restartGame() {
-	initState();
 	_display->printString(_strings.pressReturn);
-	inputString(); // Missing in the original
-	_display->printAsciiString("\r\r\r\r\r");
+	initState();
+	_display->printAsciiString(_strings.lineFeeds);
 }
 
 void HiRes1Engine::printString(const Common::String &str) {
diff --git a/engines/adl/hires1.h b/engines/adl/hires1.h
index 02eb75aa19..251d0797c8 100644
--- a/engines/adl/hires1.h
+++ b/engines/adl/hires1.h
@@ -65,6 +65,7 @@ namespace Adl {
 #define IDI_HR1_OFS_STR_DONT_UNDERSTAND 0x6c51
 #define IDI_HR1_OFS_STR_GETTING_DARK    0x6c7c
 #define IDI_HR1_OFS_STR_PRESS_RETURN    0x5f68
+#define IDI_HR1_OFS_STR_LINE_FEEDS      0x59d4
 
 #define IDI_HR1_OFS_PD_TEXT_0    0x005d
 #define IDI_HR1_OFS_PD_TEXT_1    0x012b
diff --git a/engines/adl/hires2.cpp b/engines/adl/hires2.cpp
index a1303b652c..5a4e0e5fd6 100644
--- a/engines/adl/hires2.cpp
+++ b/engines/adl/hires2.cpp
@@ -77,6 +77,10 @@ void HiRes2Engine::init() {
 	stream.reset(_disk->createReadStream(0x19, 0x7, 0xd7));
 	_strings_v2.time = readString(*stream, 0xff);
 
+	// Read line feeds
+	stream.reset(_disk->createReadStream(0x19, 0xb, 0xf8, 1));
+	_strings.lineFeeds = readString(*stream);
+
 	// Read opcode strings
 	stream.reset(_disk->createReadStream(0x1a, 0x6, 0x00, 2));
 	_strings_v2.saveInsert = readStringAt(*stream, 0x5f);
@@ -184,7 +188,9 @@ void HiRes2Engine::initState() {
 }
 
 void HiRes2Engine::restartGame() {
+	_display->printString(_strings.pressReturn);
 	initState();
+	_display->printAsciiString(_strings.lineFeeds);
 }
 
 Engine *HiRes2Engine_create(OSystem *syst, const AdlGameDescription *gd) {