From 1949f4511fa1bfc99f6f336dbf10dc0668021fff Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Thu, 13 Feb 2014 08:14:01 +0100
Subject: VOYEUR: Some renaming in Files

---
 engines/voyeur/files.cpp         | 12 ++++++------
 engines/voyeur/files.h           | 14 +++++++-------
 engines/voyeur/files_threads.cpp |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'engines/voyeur')

diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 79e81b0cd1..9373ecfb5f 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -398,8 +398,8 @@ byte *BoltFile::getBoltMember(uint32 id) {
 
 	// Get the entry
 	_state._curMemberPtr = &_state._curGroupPtr->_entries[id & 0xff];
-	if (_state._curMemberPtr->_field1)
-		initMem(_state._curMemberPtr->_field1);
+	if (_state._curMemberPtr->_initMemRequired)
+		initMem(_state._curMemberPtr->_initMemRequired);
 
 	// Return the data for the entry if it's already been loaded
 	if (_state._curMemberPtr->_data)
@@ -674,7 +674,7 @@ BoltEntry::BoltEntry(Common::SeekableReadStream *f, uint16 id): _file(f), _id(id
 	byte buffer[16];
 	_file->read(&buffer[0], 16);
 	_mode = buffer[0];
-	_field1 = buffer[1];
+	_initMemRequired = buffer[1];
 	_initMethod = buffer[3];
 	_xorMask = buffer[4] & 0xff;
 	_size = READ_LE_UINT32(&buffer[4]) & 0xffffff;
@@ -965,13 +965,13 @@ int DisplayResource::drawText(const Common::String &msg) {
 		if (i != 0) {
 			fontChar._pick = 0;
 			fontChar._onOff = fontInfo._shadowColor;
-		} else if (fontData.field2 == 1 || (fontInfo._fontFlags & 0x10)) {
+		} else if (fontData._fontDepth == 1 || (fontInfo._fontFlags & 0x10)) {
 			fontChar._pick = 0;
 			fontChar._onOff = fontInfo._foreColor;
 		} else {
 			fontChar._pick = fontInfo._picPick;
 			fontChar._onOff = fontInfo._picOnOff;
-			fontChar._depth = fontData.field2;
+			fontChar._depth = fontData._fontDepth;
 		}
 
 		// Loop to draw each character in turn
@@ -1469,7 +1469,7 @@ ViewPortPalEntry::ViewPortPalEntry(const byte *src) {
 FontResource::FontResource(BoltFilesState &state, byte *src) {
 	_minChar = src[0];
 	_maxChar = src[1];
-	field2 = src[2];
+	_fontDepth = src[2];
 	_padding = src[3];
 	_fontHeight = src[5];
 	_topPadding = (int8)src[6];
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 0e5be690f2..69802d8f68 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -194,7 +194,7 @@ private:
 public:
 	uint16 _id;
 	byte _mode;
-	byte _field1;
+	byte _initMemRequired;
 	byte _initMethod;
 	int _fileOffset;
 	byte _xorMask;
@@ -350,7 +350,7 @@ public:
 	int _pageIndex;
 	int _lastPage;
 	Common::Rect _bounds;
-	int _field18;
+	int _field18;  // Useless variable
 	PictureResource *_currentPic;
 	PictureResource *_activePage;
 	PictureResource *_pages[2];
@@ -403,7 +403,7 @@ public:
 class FontResource {
 public:
 	int _minChar, _maxChar;
-	int field2;
+	int _fontDepth;
 	int _padding;
 	int _fontHeight;
 	int _topPadding;
@@ -569,15 +569,15 @@ public:
 	int _newStateId;
 	int _newStackId;
 	int _flags;
-	int _fieldA[8];
-	int _field2A[8];
+	int _fieldA[8];  // Useless variable
+	int _field2A[8]; // Useless variable
 	int _stateFlags;
 	int _stateCount;
 	int _parseCount;
-	uint32 _field46;
+	uint32 _nextStateId;
 	byte *_threadInfoPtr;
 	byte _buttonFlags[64];
-	const byte *_field8E[64];
+	const byte *_field8E[64]; // Useless variable
 	byte _buttonIds[64];
 	const byte *_buttonUnused[48];
 	byte *_ctlPtr;
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 2241431ac4..897bfae1b6 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -117,7 +117,7 @@ bool ThreadResource::getStateInfo() {
 	} else {
 		uint32 fld = READ_LE_UINT32(_ctlPtr + 2);
 		fld += _stateId << 3;
-		_field46 = READ_LE_UINT32(_ctlPtr + fld + 4);
+		_nextStateId = READ_LE_UINT32(_ctlPtr + fld + 4);
 		
 		fld = READ_LE_UINT32(_ctlPtr + fld);
 		byte *baseP = _ctlPtr + fld;
@@ -895,7 +895,7 @@ const byte *ThreadResource::cardPerform(const byte *card) {
 		card += 2;
 	
 	case 45:
-		_newStateId = _field46;
+		_newStateId = _nextStateId;
 		_newStackId = _stackId;
 		break;
 
-- 
cgit v1.2.3