From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 engines/m4/console.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/m4/console.cpp')

diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp
index cbcaa04669..b6d8093f78 100644
--- a/engines/m4/console.cpp
+++ b/engines/m4/console.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/textconsole.h"
-- 
cgit v1.2.3


From 2149edbe5d5c4699eaaf826c7a769ab764548eac Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 17 May 2011 15:04:07 +0200
Subject: M4: Fix leak in Console::cmdDumpFile

---
 engines/m4/console.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/m4/console.cpp')

diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp
index b6d8093f78..6f45f11f5a 100644
--- a/engines/m4/console.cpp
+++ b/engines/m4/console.cpp
@@ -147,12 +147,12 @@ bool Console::cmdDumpFile(int argc, const char **argv) {
 		DebugPrintf("If uncompress is 1, the file is uncompressed (for MADS games)\n");
 	} else {
 		if (argc == 2) {
-			_vm->dumpFile(strdup(argv[1]));
+			_vm->dumpFile(argv[1], false);
 		} else {
 			if (argc == 3 && atoi(argv[2]) == 1)
-				_vm->dumpFile(strdup(argv[1]), true);
+				_vm->dumpFile(argv[1], true);
 			else
-				_vm->dumpFile(strdup(argv[1]));
+				_vm->dumpFile(argv[1], false);
 		}
 	}
 	return true;
-- 
cgit v1.2.3


From ed20f18d29fa6fcfa682c74530515e26a94aef29 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 29 May 2011 21:02:06 +1000
Subject: TSAGE: General cleanup of object class

---
 engines/m4/console.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engines/m4/console.cpp')

diff --git a/engines/m4/console.cpp b/engines/m4/console.cpp
index 6f45f11f5a..fa4ca6d121 100644
--- a/engines/m4/console.cpp
+++ b/engines/m4/console.cpp
@@ -267,7 +267,7 @@ bool MadsConsole::cmdObject(int argc, const char **argv) {
 			DebugPrintf("%2d - ", objStart);
 			for (uint objId = objStart; objId < MIN<uint>(_vm->globals()->getObjectsSize(), objStart + 5); ++objId) {
 				if (objId != objStart) DebugPrintf(", ");
-				uint16 descId = _vm->globals()->getObject(objId)->descId;
+				uint16 descId = _vm->globals()->getObject(objId)->_descId;
 				DebugPrintf("%s", _vm->globals()->getVocab(descId));
 			}
 
@@ -297,15 +297,15 @@ bool MadsConsole::cmdObject(int argc, const char **argv) {
 		else {
 			const MadsObject *obj = _vm->globals()->getObject(objNum);
 
-			DebugPrintf("Object #%d (%s) room=%d article=%d/%s vocabs=%d", objNum, _vm->globals()->getVocab(obj->descId),
-				obj->roomNumber, (int)obj->article, englishMADSArticleList[obj->article], obj->vocabCount);
+			DebugPrintf("Object #%d (%s) room=%d article=%d/%s vocabs=%d", objNum, _vm->globals()->getVocab(obj->_descId),
+				obj->_roomNumber, (int)obj->_article, englishMADSArticleList[obj->_article], obj->_vocabCount);
 
-			if (obj->vocabCount > 0) {
+			if (obj->_vocabCount > 0) {
 				DebugPrintf(" - ");
-				for (int i = 0; i < obj->vocabCount; ++i) {
+				for (int i = 0; i < obj->_vocabCount; ++i) {
 					if (i != 0) DebugPrintf(", ");
-					DebugPrintf("%s (%d)/%d,%d", _vm->globals()->getVocab(obj->vocabList[i].vocabId),
-						obj->vocabList[i].vocabId, obj->vocabList[i].flags1, obj->vocabList[i].flags2);
+					DebugPrintf("%s (%d)/%d,%d", _vm->globals()->getVocab(obj->_vocabList[i].vocabId),
+						obj->_vocabList[i].vocabId, obj->_vocabList[i].flags1, obj->_vocabList[i].flags2);
 				}
 			}
 			DebugPrintf("\n");
-- 
cgit v1.2.3