From ef1165e8b5a9ec26b5bcaf365769d45b87d80c65 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 2 Jan 2015 00:44:34 +0100
Subject: ACCESS: MM - More renaming

---
 engines/access/martian/martian_game.cpp | 27 ++++++++++++++-------------
 engines/access/martian/martian_game.h   |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index a4cc752c45..8eea5d1a1c 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -133,13 +133,13 @@ void MartianEngine::doSpecial5(int param1) {
 	_screen->forceFadeIn();
 	warning("TODO: LoadCells");
 	_timers[20]._timer = _timers[20]._initTm = 30;
-	Resource *_word20060 = _files->loadFile("NOTES.DAT");
-	_word20060->_stream->skip(param1 * 2);
-	int pos = _word20060->_stream->readUint16LE();
-	_word20060->_stream->seek(pos);
+	Resource *_notesRes = _files->loadFile("NOTES.DAT");
+	_notesRes->_stream->skip(param1 * 2);
+	int pos = _notesRes->_stream->readUint16LE();
+	_notesRes->_stream->seek(pos);
 	Common::String msg = "";
 	byte c;
-	while ((c = (char)_word20060->_stream->readByte()) != '\0')
+	while ((c = (char)_notesRes->_stream->readByte()) != '\0')
 		msg += c;
 
 	displayNote(msg);
@@ -161,10 +161,11 @@ void MartianEngine::playGame() {
 
 	if (_loadSaveSlot == -1) {
 		// Do introduction
-//		doCredits();
+		doCredits();
 		if (shouldQuit())
 			return;
-		
+
+		// Display Notes screen
 		doSpecial5(4);
 		if (shouldQuit())
 			return;
@@ -196,19 +197,19 @@ bool MartianEngine::showCredits() {
 	_screen->clearScreen();
 	_destIn = _screen;
 
-	int val1 = _demoStream->readSint16LE();
+	int val1 = _creditsStream->readSint16LE();
 	int val2 = 0;
 	int val3 = 0;
 
 	while(val1 != -1) {
-		val2 = _demoStream->readSint16LE();
-		val3 = _demoStream->readSint16LE();
+		val2 = _creditsStream->readSint16LE();
+		val3 = _creditsStream->readSint16LE();
 		_screen->plotImage(_introObjects, val3, Common::Point(val1, val2));
 
-		val1 = _demoStream->readSint16LE();
+		val1 = _creditsStream->readSint16LE();
 	}
 
-	val2 = _demoStream->readSint16LE();
+	val2 = _creditsStream->readSint16LE();
 	if (val2 == -1) {
 		_events->showCursor();
 		_screen->forceFadeOut();
@@ -246,7 +247,7 @@ void MartianEngine::doCredits() {
 	_buffer2.copyFrom(*_screen);
 	_buffer1.copyFrom(*_screen);
 	_events->showCursor();
-	_demoStream = new Common::MemoryReadStream(DEMO_DATA, 180);
+	_creditsStream = new Common::MemoryReadStream(DEMO_DATA, 180);
 
 	if (!showCredits()) {
 		_screen->copyFrom(_buffer2);
diff --git a/engines/access/martian/martian_game.h b/engines/access/martian/martian_game.h
index 059644ce59..03f3e0f5fa 100644
--- a/engines/access/martian/martian_game.h
+++ b/engines/access/martian/martian_game.h
@@ -33,7 +33,7 @@ class MartianEngine : public AccessEngine {
 private:
 	bool _skipStart;
 	SpriteResource *_introObjects;
-	Common::MemoryReadStream *_demoStream;
+	Common::MemoryReadStream *_creditsStream;
 	/**
 	 * Do the game introduction
 	 */
-- 
cgit v1.2.3