[Scummvm-git-logs] scummvm master -> 6a6058a1cc3c3dac9b2c2dae13c020a8452b9969

[waltervn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a6058a1cc ADL: Reset linesPrinted in game loop


Commit: 6a6058a1cc3c3dac9b2c2dae13c020a8452b9969
    https://github.com/scummvm/scummvm/commit/6a6058a1cc3c3dac9b2c2dae13c020a8452b9969
Author: Walter van Niftrik (walter at scummvm.org)
Date: 2017-02-23T14:36:32+01:00

Commit Message:
ADL: Reset linesPrinted in game loop

Changed paths:
    engines/adl/adl.cpp
    engines/adl/adl.h
    engines/adl/adl_v2.cpp
    engines/adl/adl_v2.h
    engines/adl/hires6.cpp


diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
index 58d5fa9..1f0b0b1 100644
--- a/engines/adl/adl.cpp
+++ b/engines/adl/adl.cpp
@@ -56,6 +56,7 @@ AdlEngine::AdlEngine(OSystem *syst, const AdlGameDescription *gd) :
 		_display(nullptr),
 		_graphics(nullptr),
 		_textMode(false),
+		_linesPrinted(0),
 		_isRestarting(false),
 		_isRestoring(false),
 		_isQuitting(false),
@@ -635,6 +636,8 @@ void AdlEngine::gameLoop() {
 		if (shouldQuit())
 			return;
 
+		_linesPrinted = 0;
+
 		// If we just restored from the GMM, we skip this command
 		// set, as no command has been input by the user
 		if (!_isRestoring)
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index d71d408..3ac99c4 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -390,6 +390,7 @@ protected:
 	// Game state
 	State _state;
 
+	uint _linesPrinted;
 	bool _isRestarting, _isRestoring, _isQuitting;
 	bool _canSaveNow, _canRestoreNow;
 	bool _abortScript;
diff --git a/engines/adl/adl_v2.cpp b/engines/adl/adl_v2.cpp
index 272e780..5392526 100644
--- a/engines/adl/adl_v2.cpp
+++ b/engines/adl/adl_v2.cpp
@@ -36,7 +36,6 @@ AdlEngine_v2::~AdlEngine_v2() {
 
 AdlEngine_v2::AdlEngine_v2(OSystem *syst, const AdlGameDescription *gd) :
 		AdlEngine(syst, gd),
-		_linesPrinted(0),
 		_maxLines(4),
 		_disk(nullptr),
 		_itemRemoved(false),
@@ -285,9 +284,6 @@ void AdlEngine_v2::showRoom() {
 
 	_display->updateHiResScreen();
 	printString(_roomData.description);
-
-	// FIXME: move to main loop?
-	_linesPrinted = 0;
 }
 
 // TODO: Merge this into AdlEngine?
diff --git a/engines/adl/adl_v2.h b/engines/adl/adl_v2.h
index 5447974..63d2297 100644
--- a/engines/adl/adl_v2.h
+++ b/engines/adl/adl_v2.h
@@ -86,7 +86,7 @@ protected:
 		Common::String restoreInsert, restoreReplace;
 	} _strings_v2;
 
-	uint _linesPrinted, _maxLines;
+	uint _maxLines;
 	DiskImage *_disk;
 	Common::Array<DataBlockPtr> _itemPics;
 	bool _itemRemoved;
diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
index fa243e3..0f21a14 100644
--- a/engines/adl/hires6.cpp
+++ b/engines/adl/hires6.cpp
@@ -372,9 +372,6 @@ void HiRes6Engine::showRoom() {
 	_display->updateHiResScreen();
 	setVar(2, 0xff);
 	printString(_roomData.description);
-
-	// FIXME: move to main loop?
-	_linesPrinted = 0;
 }
 
 Common::String HiRes6Engine::formatVerbError(const Common::String &verb) const {