TONY: Rename variables in loc.h and mpal.h

2 files changed, 53 insertions, 53 deletions

diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 162ba4c776..3b798b8071 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -490,7 +490,7 @@ static LPITEM getItemData(uint32 nOrdItem) {
 	ret = (LPITEM)globalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(ITEM));
 	if (ret == NULL)
 		return NULL;
-	ret->speed = 150;
+	ret->_speed = 150;
 
 	hDat = resLoad(curitem->dwRes);
 	dat = (char *)globalLock(hDat);
@@ -500,65 +500,65 @@ static LPITEM getItemData(uint32 nOrdItem) {
 		dat += 4;
 
 		if (i >= 0x10) {	// From 1.0, there's a destination point for each object
-			ret->destX = (int16)READ_LE_UINT16(dat);
-			ret->destY = (int16)READ_LE_UINT16(dat + 2);
+			ret->_destX = (int16)READ_LE_UINT16(dat);
+			ret->_destY = (int16)READ_LE_UINT16(dat + 2);
 			dat += 4;
 		}
 
 		if (i >= 0x11) {	// From 1.1, there's animation speed
-			ret->speed = READ_LE_UINT16(dat);
+			ret->_speed = READ_LE_UINT16(dat);
 			dat += 2;
 		} else
-			ret->speed = 150;
+			ret->_speed = 150;
 	}
 
-	ret->numframe = *dat++;
-	ret->numpattern = *dat++;
-	ret->Zvalue = *dat++;
+	ret->_numframe = *dat++;
+	ret->_numpattern = *dat++;
+	ret->_destZ = *dat++;
 
 	// Upload the left & top co-ordinates of each frame
-	for (i = 0; i < ret->numframe; i++) {
-		ret->frameslocations[i].left = (int16)READ_LE_UINT16(dat);
-		ret->frameslocations[i].top = (int16)READ_LE_UINT16(dat + 2);
+	for (i = 0; i < ret->_numframe; i++) {
+		ret->_frameslocations[i].left = (int16)READ_LE_UINT16(dat);
+		ret->_frameslocations[i].top = (int16)READ_LE_UINT16(dat + 2);
 		dat += 4;
 	}
 
 	// Upload the size of each frame and calculate the right & bottom
-	for (i = 0; i < ret->numframe; i++) {
-		ret->frameslocations[i].right = (int16)READ_LE_UINT16(dat) + ret->frameslocations[i].left;
-		ret->frameslocations[i].bottom = (int16)READ_LE_UINT16(dat + 2) + ret->frameslocations[i].top;
+	for (i = 0; i < ret->_numframe; i++) {
+		ret->_frameslocations[i].right = (int16)READ_LE_UINT16(dat) + ret->_frameslocations[i].left;
+		ret->_frameslocations[i].bottom = (int16)READ_LE_UINT16(dat + 2) + ret->_frameslocations[i].top;
 		dat += 4;
 	}
 
 	// Upload the bounding boxes of each frame
-	for (i = 0; i < ret->numframe; i++) {
-		ret->bbox[i].left = (int16)READ_LE_UINT16(dat);
-		ret->bbox[i].top = (int16)READ_LE_UINT16(dat + 2);
-		ret->bbox[i].right = (int16)READ_LE_UINT16(dat + 4);
-		ret->bbox[i].bottom = (int16)READ_LE_UINT16(dat + 6);
+	for (i = 0; i < ret->_numframe; i++) {
+		ret->_bbox[i].left = (int16)READ_LE_UINT16(dat);
+		ret->_bbox[i].top = (int16)READ_LE_UINT16(dat + 2);
+		ret->_bbox[i].right = (int16)READ_LE_UINT16(dat + 4);
+		ret->_bbox[i].bottom = (int16)READ_LE_UINT16(dat + 6);
 		dat += 8;
 	}
 
 	// Load the animation pattern
 	patlength = dat;
-	dat += ret->numpattern;
+	dat += ret->_numpattern;
 
-	for (i = 1; i < ret->numpattern; i++) {
+	for (i = 1; i < ret->_numpattern; i++) {
 		for (j = 0; j < patlength[i]; j++)
-			ret->pattern[i][j] = dat[j];
-		ret->pattern[i][(int)patlength[i]] = 255;   // Terminate pattern
+			ret->_pattern[i][j] = dat[j];
+		ret->_pattern[i][(int)patlength[i]] = 255;   // Terminate pattern
 		dat += patlength[i];
 	}
 
 	// Upload the individual frames of animations
-	for (i = 1; i < ret->numframe; i++) {
-		dim = (uint32)(ret->frameslocations[i].right-ret->frameslocations[i].left) *
-			(uint32)(ret->frameslocations[i].bottom-ret->frameslocations[i].top);
-		ret->frames[i] = (char *)globalAlloc(GMEM_FIXED,dim);
+	for (i = 1; i < ret->_numframe; i++) {
+		dim = (uint32)(ret->_frameslocations[i].right - ret->_frameslocations[i].left) *
+			(uint32)(ret->_frameslocations[i].bottom - ret->_frameslocations[i].top);
+		ret->_frames[i] = (char *)globalAlloc(GMEM_FIXED,dim);
    
-		if (ret->frames[i] == NULL)
+		if (ret->_frames[i] == NULL)
 			return NULL;
-		copyMemory(ret->frames[i], dat, dim);
+		copyMemory(ret->_frames[i], dat, dim);
 		dat += dim;
 	}
 
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index 198083f851..9ea0c40bbc 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -152,19 +152,19 @@ enum QueryTypes {
  * Framework to manage the animation of an item
  */
 typedef struct {
-  char *frames[MAXFRAMES];
-  Common::Rect frameslocations[MAXFRAMES];
-  Common::Rect bbox[MAXFRAMES];
-  short pattern[MAXPATTERN][MAXFRAMES];
-  short speed;
-  char numframe;
-  char numpattern;
-  char curframe;
-  char curpattern;
-  short destX, destY;
-  signed char Zvalue;
-  short objectID;
-  char TAG;
+  char *_frames[MAXFRAMES];
+  Common::Rect _frameslocations[MAXFRAMES];
+  Common::Rect _bbox[MAXFRAMES];
+  short _pattern[MAXPATTERN][MAXFRAMES];
+  short _speed;
+  char _numframe;
+  char _numpattern;
+  char _curframe;
+  char _curpattern;
+  short _destX, _destY;
+  signed char _destZ;
+  short _objectID;
+//  char TAG;
 } ITEM;
 typedef ITEM *LPITEM;
 
@@ -247,7 +247,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * @returns		Size
  */
 #define mpalQueryLocationSize(nLoc,dwCoord)             \
-        mpalQueryDWORD(MPQ_LOCATION_SIZE,(uint32)(nLoc),(uint32)(dwCoord))
+        mpalQueryDWORD(MPQ_LOCATION_SIZE, (uint32)(nLoc), (uint32)(dwCoord))
 
 
 /**
@@ -258,7 +258,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  */
 // TODO: Determine if this is endian safe
 #define mpalQueryItemList(nLoc)                         \
-        (uint32 *)mpalQueryHANDLE(MPQ_ITEM_LIST,(uint32)(nLoc))
+        (uint32 *)mpalQueryHANDLE(MPQ_ITEM_LIST, (uint32)(nLoc))
 
 
 /**
@@ -268,7 +268,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * @returns		Structure filled with requested information
  */
 #define mpalQueryItemData(nItem)                          \
-        (LPITEM)mpalQueryHANDLE(MPQ_ITEM_DATA,(uint32)(nItem))
+        (LPITEM)mpalQueryHANDLE(MPQ_ITEM_DATA, (uint32)(nItem))
 
 
 /**
@@ -279,7 +279,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * @remarks		By default, the pattern of 0 indicates that we should do nothing.
  */
 #define mpalQueryItemPattern(nItem)                  \
-        mpalQueryDWORD(MPQ_ITEM_PATTERN,(uint32)(nItem))
+        mpalQueryDWORD(MPQ_ITEM_PATTERN, (uint32)(nItem))
 
 
 /**
@@ -289,7 +289,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * @returns		TRUE if the item is active, FALSE otherwise
  */
 #define mpalQueryItemIsActive(nItem)                  \
-        (bool)mpalQueryDWORD(MPQ_ITEM_IS_ACTIVE,(uint32)(nItem))
+        (bool)mpalQueryDWORD(MPQ_ITEM_IS_ACTIVE, (uint32)(nItem))
 
 
 /**
@@ -302,7 +302,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  *				is less than or equal to 0), the string will be empty.
  */
 #define mpalQueryItemName(nItem, lpszName)             \
-        mpalQueryHANDLE(MPQ_ITEM_NAME,(uint32)(nItem), (LPSTR)(lpszName))
+        mpalQueryHANDLE(MPQ_ITEM_NAME, (uint32)(nItem), (LPSTR)(lpszName))
 
 
 /**
@@ -337,7 +337,7 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * The pointer msut be freed after use using the memory memory.
  */
 #define mpalQueryDialogSelectList(nChoice)              \
-        (uint32 *)mpalQueryHANDLE(MPQ_DIALOG_SELECTLIST,(uint32)(nChoice))
+        (uint32 *)mpalQueryHANDLE(MPQ_DIALOG_SELECTLIST, (uint32)(nChoice))
 
 
 /**
@@ -351,11 +351,11 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
  * Groups according to the execution of the dialogue. And necessary so the game 
  * remains on hold again for another chosen by mpalQueryDialogWaitForChoice ().
  */
-#define mpalQueryDialogSelection(nChoice,dwData)        \
-        (bool)mpalQueryDWORD(MPQ_DIALOG_SELECTION,(uint32)(nChoice),(uint32)(dwData))
+#define mpalQueryDialogSelection(nChoice, dwData)        \
+        (bool)mpalQueryDWORD(MPQ_DIALOG_SELECTION, (uint32)(nChoice), (uint32)(dwData))
 
-#define mpalQueryDialogSelectionDWORD(nChoice,dwData)        \
-        mpalQueryDWORD(MPQ_DIALOG_SELECTION,(uint32)(nChoice),(uint32)(dwData))
+#define mpalQueryDialogSelectionDWORD(nChoice, dwData)        \
+        mpalQueryDWORD(MPQ_DIALOG_SELECTION, (uint32)(nChoice), (uint32)(dwData))
 
 
 /**