FULLPIPE: Renames in PreloadItem

4 files changed, 38 insertions, 38 deletions

diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index cd148a8e0e..e49e56d6f0 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -307,7 +307,7 @@ bool preloadCallback(PreloadItem &pre, int flag) {
 				g_fp->_scene3 = 0;
 			}
 		} else {
-			scene19_setMovements(g_fp->accessScene(pre.preloadId1), pre.keyCode);
+			scene19_setMovements(g_fp->accessScene(pre.preloadId1), pre.param);
 
 			g_vars->scene18_inScene18p1 = true;
 
@@ -318,9 +318,9 @@ bool preloadCallback(PreloadItem &pre, int flag) {
 			}
 		}
 
-		if (((pre.sceneId == SC_19 && pre.keyCode == TrubaRight) || (pre.sceneId == SC_18 && pre.keyCode == TrubaRight)) && !pre.preloadId2) {
+		if (((pre.sceneId == SC_19 && pre.param == TrubaRight) || (pre.sceneId == SC_18 && pre.param == TrubaRight)) && !pre.preloadId2) {
 			pre.sceneId = SC_18;
-			pre.keyCode = TrubaLeft;
+			pre.param = TrubaLeft;
 		}
 
 		if (!g_fp->_loaderScene) {
@@ -398,7 +398,7 @@ bool GameLoader::preloadScene(int sceneId, int entranceId) {
 
 	ExCommand *ex = new ExCommand(_preloadItems[idx]->sceneId, 17, 62, 0, 0, 0, 1, 0, 0, 0);
 	ex->_excFlags = 2;
-	ex->_param = _preloadItems[idx]->keyCode;
+	ex->_param = _preloadItems[idx]->param;
 
 	_preloadSceneId = 0;
 	_preloadEntranceId = 0;
@@ -690,7 +690,7 @@ bool PreloadItems::load(MfcArchive &file) {
 		t->preloadId1 = file.readUint32LE();
 		t->preloadId2 = file.readUint32LE();
 		t->sceneId = file.readUint32LE();
-		t->keyCode = file.readSint32LE();
+		t->param = file.readSint32LE();
 
 		push_back(t);
 	}
diff --git a/engines/fullpipe/gameloader.h b/engines/fullpipe/gameloader.h
index 682d1aad89..bb9b934b59 100644
--- a/engines/fullpipe/gameloader.h
+++ b/engines/fullpipe/gameloader.h
@@ -64,7 +64,7 @@ struct PreloadItem {
 	int preloadId1;
 	int preloadId2;
 	int sceneId;
-	int keyCode;
+	int param;
 };
 
 bool preloadCallback(PreloadItem &pre, int flag);
diff --git a/engines/fullpipe/lift.cpp b/engines/fullpipe/lift.cpp
index 32a4532e36..c64e7b67fa 100644
--- a/engines/fullpipe/lift.cpp
+++ b/engines/fullpipe/lift.cpp
@@ -408,7 +408,7 @@ void FullpipeEngine::lift_goAnimation() {
 			if (pre->preloadId2 == buttonId && pre->preloadId1 == _currentScene->_sceneId) {
 				MessageQueue *mq = new MessageQueue(_globalMessageQueueList->compact());
 
-				ExCommand *ex = new ExCommand(ANI_MAN, 1, (pre->keyCode != LiftDown ? MV_MAN_LIFTDOWN : MV_MAN_LIFTUP), 0, 0, 0, 1, 0, 0, 0);
+				ExCommand *ex = new ExCommand(ANI_MAN, 1, (pre->param != LiftDown ? MV_MAN_LIFTDOWN : MV_MAN_LIFTUP), 0, 0, 0, 1, 0, 0, 0);
 
 				ex->_param = -1;
 				ex->_field_24 = 1;
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 5a6380103c..c7c303f2e0 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -1124,17 +1124,17 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_1:
 		updateMapPiece(PIC_MAP_S01, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_P01, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_A13, 1);
 		break;
 
 	case SC_2:
 		updateMapPiece(PIC_MAP_S02, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_P01, 1);
 
 		break;
@@ -1146,7 +1146,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_4:
 		updateMapPiece(PIC_MAP_S04, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_P04, 1);
 
 		break;
@@ -1154,11 +1154,11 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_5:
 		updateMapPiece(PIC_MAP_S05, 1);
 
-		if (pre->keyCode == TrubaLeft) {
+		if (pre->param == TrubaLeft) {
 			updateMapPiece(PIC_MAP_P04, 1);
 		}
 
-		if (pre->keyCode == TrubaUp) {
+		if (pre->param == TrubaUp) {
 			updateMapPiece(PIC_MAP_P05, 1);
 			updateMapPiece(PIC_MAP_A11, 1);
 		}
@@ -1168,7 +1168,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_6:
 		updateMapPiece(PIC_MAP_S06, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_A12, 1);
 
 		break;
@@ -1176,7 +1176,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_7:
 		updateMapPiece(PIC_MAP_S07, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_P18, 1);
 
 		break;
@@ -1184,10 +1184,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_8:
 		updateMapPiece(PIC_MAP_S08, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_P11, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_P18, 1);
 
 		return;
@@ -1195,7 +1195,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_9:
 		updateMapPiece(PIC_MAP_S09, 1);
 
-		if (pre->keyCode == TrubaDown)
+		if (pre->param == TrubaDown)
 			updateMapPiece(PIC_MAP_P11, 1);
 
 		return;
@@ -1203,7 +1203,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_10:
 		updateMapPiece(PIC_MAP_S10, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_P02, 1);
 
 		break;
@@ -1211,7 +1211,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_11:
 		updateMapPiece(PIC_MAP_S11, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_P02, 1);
 
 		break;
@@ -1223,7 +1223,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_13:
 		updateMapPiece(PIC_MAP_S13, 1);
 
-		if (pre->keyCode == TrubaUp) {
+		if (pre->param == TrubaUp) {
 			updateMapPiece(PIC_MAP_P06, 1);
 			updateMapPiece(PIC_MAP_A10, 1);
 		}
@@ -1236,7 +1236,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_15:
 		updateMapPiece(PIC_MAP_S15, 1);
 
-		if (pre->keyCode == TrubaUp) {
+		if (pre->param == TrubaUp) {
 			updateMapPiece(PIC_MAP_P08, 1);
 			updateMapPiece(PIC_MAP_A14, 1);
 		}
@@ -1254,7 +1254,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_18:
 		updateMapPiece(PIC_MAP_S1819, 1);
 
-		if (pre->keyCode == PIC_SC18_RTRUBA)
+		if (pre->param == PIC_SC18_RTRUBA)
 			updateMapPiece(PIC_MAP_P14, 1);
 
 		break;
@@ -1262,7 +1262,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_19:
 		updateMapPiece(PIC_MAP_S1819, 1);
 
-		if (pre->keyCode == PIC_SC19_RTRUBA3) {
+		if (pre->param == PIC_SC19_RTRUBA3) {
 			updateMapPiece(PIC_MAP_P15, 1);
 			updateMapPiece(PIC_MAP_A09, 1);
 		}
@@ -1276,12 +1276,12 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_21:
 		updateMapPiece(PIC_MAP_S21, 1);
 
-		if (pre->keyCode == TrubaLeft) {
+		if (pre->param == TrubaLeft) {
 			updateMapPiece(PIC_MAP_P15, 1);
 			updateMapPiece(PIC_MAP_A09, 1);
 		}
 
-		if (pre->keyCode == TrubaDown)
+		if (pre->param == TrubaDown)
 			updateMapPiece(PIC_MAP_A08, 1);
 
 		break;
@@ -1304,10 +1304,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_24:
 		updateMapPiece(PIC_MAP_S24, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_A08, 1);
 
-		if (pre->keyCode == TrubaDown) {
+		if (pre->param == TrubaDown) {
 			updateMapPiece(PIC_MAP_P13, 1);
 			updateMapPiece(PIC_MAP_A07, 1);
 		}
@@ -1320,10 +1320,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_26:
 		updateMapPiece(PIC_MAP_S26, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_A06, 1);
 
-		if (pre->keyCode == TrubaUp) {
+		if (pre->param == TrubaUp) {
 			updateMapPiece(PIC_MAP_P13, 1);
 			updateMapPiece(PIC_MAP_A07, 1);
 		}
@@ -1337,7 +1337,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_28:
 		updateMapPiece(PIC_MAP_S28, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_A06, 1);
 
 		break;
@@ -1345,7 +1345,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_29:
 		updateMapPiece(PIC_MAP_S29, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_A05, 1);
 
 		break;
@@ -1353,10 +1353,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_30:
 		updateMapPiece(PIC_MAP_S30, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_P09, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_A04, 1);
 
 		break;
@@ -1367,7 +1367,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 		if (getObjectState(sO_Cactus) == getObjectEnumState(sO_Cactus, sO_HasGrown))
 			updateMapPiece(PIC_MAP_S31_1, 1);
 
-		if (pre->keyCode == TrubaRight)
+		if (pre->param == TrubaRight)
 			updateMapPiece(PIC_MAP_P09, 1);
 
 		break;
@@ -1387,7 +1387,7 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_34:
 		updateMapPiece(PIC_MAP_S34, 1);
 
-		if (pre->keyCode == TrubaUp)
+		if (pre->param == TrubaUp)
 			updateMapPiece(PIC_MAP_A03, 1);
 
 		break;
@@ -1395,10 +1395,10 @@ void FullpipeEngine::updateMap(PreloadItem *pre) {
 	case SC_35:
 		updateMapPiece(PIC_MAP_S35, 1);
 
-		if (pre->keyCode == TrubaLeft)
+		if (pre->param == TrubaLeft)
 			updateMapPiece(PIC_MAP_A02, 1);
 
-		if (pre->keyCode == TrubaDown)
+		if (pre->param == TrubaDown)
 			updateMapPiece(PIC_MAP_A03, 1);
 
 		break;