FULLPIPE: Renames in ExCommand

1 files changed, 20 insertions, 20 deletions

diff --git a/engines/fullpipe/messagehandlers.cpp b/engines/fullpipe/messagehandlers.cpp
index bd67fd4295..5b440e3be3 100644
--- a/engines/fullpipe/messagehandlers.cpp
+++ b/engines/fullpipe/messagehandlers.cpp
@@ -250,7 +250,7 @@ int global_messageHandler1(ExCommand *cmd) {
 			g_fp->setCursor(g_fp->_cursorId);
 			break;
 		case 65: // open map
-			if (cmd->_field_2C == 11 && cmd->_field_14 == ANI_INV_MAP && g_fp->_flgCanOpenMap)
+			if (cmd->_field_2C == 11 && cmd->_z == ANI_INV_MAP && g_fp->_flgCanOpenMap)
 				g_fp->openMap();
 			break;
 		default:
@@ -263,7 +263,7 @@ int global_messageHandler1(ExCommand *cmd) {
 
 		ExCommand *newex = new ExCommand(0, 35, SND_CMN_031, 0, 0, 0, 1, 0, 0, 0);
 
-		newex->_field_14 = 1;
+		newex->_z = 1;
 		newex->_excFlags |= 3;
 		newex->postMessage();
 
@@ -291,19 +291,19 @@ int global_messageHandler2(ExCommand *cmd) {
 	switch (cmd->_messageNum) {
 	case 0x44c8:
 		error("0x44c8");
-		// Unk3_sub_4477A0(&unk3, _parentId, _field_14 != 0);
+		// Unk3_sub_4477A0(&unk3, _parentId, _z != 0);
 		break;
 
 	case 28:
 		ani = g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param);
 		if (ani)
-			ani->_priority = cmd->_field_14;
+			ani->_priority = cmd->_z;
 		break;
 
 	case 25:
 		ani = g_fp->_currentScene->getStaticANIObject1ById(cmd->_parentId, cmd->_param);
 		if (ani) {
-			if (cmd->_field_14) {
+			if (cmd->_z) {
 				ani->setFlags40(true);
 				ani->_callback2 = staticANIObjectCallback;
 			} else {
@@ -379,7 +379,7 @@ int global_messageHandler3(ExCommand *cmd) {
 			return g_fp->_gameLoader->gotoScene(cmd->_parentId, cmd->_param);
 		case 64:
 			if (g_fp->_currentScene && g_fp->_msgObjectId2
-					&& (!(cmd->_param & 4) || g_fp->_msgObjectId2 != cmd->_field_14 || g_fp->_msgId != cmd->_field_20)) {
+					&& (!(cmd->_param & 4) || g_fp->_msgObjectId2 != cmd->_z || g_fp->_msgId != cmd->_field_20)) {
 				ani = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_msgObjectId2, g_fp->_msgId);
 				if (ani) {
 					ani->_flags &= 0xFF7F;
@@ -396,7 +396,7 @@ int global_messageHandler3(ExCommand *cmd) {
 				g_fp->_msgY = cmd->_y;
 			}
 			if (cmd->_param & 4) {
-				g_fp->_msgObjectId2 = cmd->_field_14;
+				g_fp->_msgObjectId2 = cmd->_z;
 				g_fp->_msgId = cmd->_field_20;
 			}
 			return result;
@@ -479,13 +479,13 @@ int global_messageHandler3(ExCommand *cmd) {
 	case 57:
 		if (cmd->_field_2C) {
 			if (!cmd->_field_20) {
-				getGameLoaderInventory()->removeItem2(g_fp->_currentScene, cmd->_parentId, cmd->_x, cmd->_y, cmd->_field_14);
+				getGameLoaderInventory()->removeItem2(g_fp->_currentScene, cmd->_parentId, cmd->_x, cmd->_y, cmd->_z);
 				getGameLoaderInventory()->rebuildItemRects();
 				return 1;
 			}
 			ani = g_fp->_currentScene->getStaticANIObject1ById(g_fp->_gameLoader->_field_FA, -1);
 			if (ani) {
-				getGameLoaderInventory()->removeItem2(g_fp->_currentScene, cmd->_parentId, ani->_ox + cmd->_x, ani->_oy + cmd->_y, ani->_priority + cmd->_field_14);
+				getGameLoaderInventory()->removeItem2(g_fp->_currentScene, cmd->_parentId, ani->_ox + cmd->_x, ani->_oy + cmd->_y, ani->_priority + cmd->_z);
 				getGameLoaderInventory()->rebuildItemRects();
 				return 1;
 			}
@@ -497,7 +497,7 @@ int global_messageHandler3(ExCommand *cmd) {
 	case 55:
 		if (g_fp->_currentScene) {
 			GameObject *obj;
-			if (cmd->_field_14)
+			if (cmd->_z)
 				obj = g_fp->_currentScene->getStaticANIObject1ById(cmd->_x, cmd->_y);
 			else
 				obj = g_fp->_currentScene->getPictureObjectById(cmd->_x, cmd->_y);
@@ -557,7 +557,7 @@ int global_messageHandler4(ExCommand *cmd) {
 		if (!ani)
 			break;
 
-		int flags = cmd->_field_14;
+		int flags = cmd->_z;
 		if (flags <= 0)
 			flags = -1;
 
@@ -587,7 +587,7 @@ int global_messageHandler4(ExCommand *cmd) {
 		if (!ani)
 			break;
 
-		int flags = cmd->_field_14;
+		int flags = cmd->_z;
 		if (flags <= 0)
 			flags = -1;
 
@@ -681,8 +681,8 @@ int global_messageHandler4(ExCommand *cmd) {
 		if (!ani)
 			break;
 
-		if (cmd->_field_14 >= 0)
-			ani->_priority = cmd->_field_14;
+		if (cmd->_z >= 0)
+			ani->_priority = cmd->_z;
 
 		ani->show1(cmd->_x, cmd->_y, cmd->_messageNum, cmd->_parId);
 		break;
@@ -695,8 +695,8 @@ int global_messageHandler4(ExCommand *cmd) {
 		if (!ani)
 			break;
 
-		if (cmd->_field_14 >= 0)
-			ani->_priority = cmd->_field_14;
+		if (cmd->_z >= 0)
+			ani->_priority = cmd->_z;
 
 		ani->show2(cmd->_x, cmd->_y, cmd->_messageNum, cmd->_parId);
 		break;
@@ -733,7 +733,7 @@ int global_messageHandler4(ExCommand *cmd) {
 		if (!ani)
 			break;
 
-		ani->_flags = cmd->_messageNum | (ani->_flags & ~cmd->_field_14);
+		ani->_flags = cmd->_messageNum | (ani->_flags & ~cmd->_z);
 
 		break;
 
@@ -790,12 +790,12 @@ int MovGraph::messageHandler(ExCommand *cmd) {
 		MovGraphNode *node = link->_graphSrc;
 
 		double sq = (ani->_oy - node->_y) * (ani->_oy - node->_y) + (ani->_ox - node->_x) * (ani->_ox - node->_x);
-		int off = (node->_field_14 >> 16) & 0xFF;
-		double off2 = ((link->_graphDst->_field_14 >> 8) & 0xff) - off;
+		int off = (node->_z >> 16) & 0xFF;
+		double off2 = ((link->_graphDst->_z >> 8) & 0xff) - off;
 
 		top = off + (int)(sqrt(sq) * off2 / link->_length);
 	} else {
-		top = (gr->calcOffset(ani->_ox, ani->_oy)->_field_14 >> 8) & 0xff;
+		top = (gr->calcOffset(ani->_ox, ani->_oy)->_z >> 8) & 0xff;
 	}
 
 	if (ani->_movement) {