FULLPIPE: Rename is GabeObject

14 files changed, 62 insertions, 62 deletions

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index dcb737ac1c..6810744f8a 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -303,14 +303,14 @@ void sceneHandler04_walkClimbLadder(ExCommand *ex) {
 
 	ExCommand *ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_TOLADDER, 0, 0, 0, 1, 0, 0, 0);
 
-	ex1->_param = g_fp->_aniMan->_okeyCode;
+	ex1->_param = g_fp->_aniMan->_odelay;
 	ex1->_excFlags |= 2;
 
 	mq->addExCommandToEnd(ex1);
 
 	ExCommand *ex2 = new ExCommand(ANI_MAN, 1, MV_MAN_STOPLADDER, 0, 0, 0, 1, 0, 0, 0);
 
-	ex2->_param = g_fp->_aniMan->_okeyCode;
+	ex2->_param = g_fp->_aniMan->_odelay;
 	ex2->_excFlags |= 2;
 
 	mq->addExCommandToEnd(ex2);
@@ -589,29 +589,29 @@ MessageQueue *sceneHandler04_kozFly3(StaticANIObject *ani, double phase) {
 	if (mq) {
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		for (int i = 0; i < 5; i++) {
 			ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags |= 2;
-			ex->_param = ani->_okeyCode;
+			ex->_param = ani->_odelay;
 			mq->addExCommandToEnd(ex);
 		}
 
 		ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 	}
 
@@ -657,29 +657,29 @@ MessageQueue *sceneHandler04_kozFly5(StaticANIObject *ani, double phase) {
 
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq1->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq1->addExCommandToEnd(ex);
 
 		for (int i = 0; i < 5; i++) {
 			ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags |= 2;
-			ex->_param = ani->_okeyCode;
+			ex->_param = ani->_odelay;
 			mq1->addExCommandToEnd(ex);
 		}
 
 		ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq1->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq1->addExCommandToEnd(ex);
 	}
 
@@ -711,17 +711,17 @@ MessageQueue *sceneHandler04_kozFly6(StaticANIObject *ani) {
 
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_RAISEHEAD, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		g_vars->scene04_kozHeadRaised = true;
@@ -771,29 +771,29 @@ MessageQueue *sceneHandler04_kozFly7(StaticANIObject *ani, double phase) {
 
 		ExCommand *ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_STANDUP, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 1, MV_KZW_TURN, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 2;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		for (int i = 0; i < 2; i++) {
 			ex = new ExCommand(ANI_KOZAWKA, 1, rMV_KZW_GOR, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags |= 2;
-			ex->_param = ani->_okeyCode;
+			ex->_param = ani->_odelay;
 			mq->addExCommandToEnd(ex);
 		}
 
 		ex = new ExCommand(ANI_KOZAWKA, 6, 0, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_KOZAWKA, 17, MSG_KOZAWRESTART, 0, 0, 0, 1, 0, 0, 0);
 		ex->_excFlags |= 3;
-		ex->_param = ani->_okeyCode;
+		ex->_param = ani->_odelay;
 		mq->addExCommandToEnd(ex);
 	}
 
@@ -936,7 +936,7 @@ void sceneHandler04_walkKozyawka() {
 		g_vars->scene04_kozyawkiObjList.pop_front();
 
 		MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_KOZAW_WALK), 0, 1);
-		mq->setParamInt(-1, g_vars->scene04_walkingKozyawka->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene04_walkingKozyawka->_odelay);
 		mq->chain(0);
 	}
 }
@@ -1116,18 +1116,18 @@ void sceneHandler04_leaveLadder(ExCommand *ex) {
 
 					if (g_fp->_aniMan->_statics->_staticsId == ST_MAN_LADDERDOWN) {
 						ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_LOOKLADDERRV, 0, 0, 0, 1, 0, 0, 0);
-						ex1->_param = g_fp->_aniMan->_okeyCode;
+						ex1->_param = g_fp->_aniMan->_odelay;
 						ex1->_excFlags |= 2;
 						mq->addExCommandToEnd(ex1);
 					}
 
 					ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_STARTLADDERD, 0, 0, 0, 1, 0, 0, 0);
-					ex1->_param = g_fp->_aniMan->_okeyCode;
+					ex1->_param = g_fp->_aniMan->_odelay;
 					ex1->_excFlags |= 2;
 					mq->addExCommandToEnd(ex1);
 
 					ex1 = new ExCommand(ANI_MAN, 1, MV_MAN_FROMLADDER, 0, 0, 0, 1, 0, 0, 0);
-					ex1->_param = g_fp->_aniMan->_okeyCode;
+					ex1->_param = g_fp->_aniMan->_odelay;
 					ex1->_excFlags |= 2;
 					mq->addExCommandToEnd(ex1);
 
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 388c1d1b2c..4d1b263fd4 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -266,7 +266,7 @@ void sceneHandler06_showNextBall() {
 
 		MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_SHOWNEXTBALL), 0, 1);
 
-		mq->setParamInt(-1, g_vars->scene06_currentBall->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene06_currentBall->_odelay);
 		mq->chain(0);
 
 		++g_vars->scene06_numBallsGiven;
@@ -412,7 +412,7 @@ void sceneHandler06_fallBall() {
 
 	MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC6_FALLBALL), 0, 1);
 
-	mq->setParamInt(-1, g_vars->scene06_flyingBall->_okeyCode);
+	mq->setParamInt(-1, g_vars->scene06_flyingBall->_odelay);
 	mq->chain(0);
 
 	g_vars->scene06_balls.push_back(g_vars->scene06_flyingBall);
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index 313bf9d012..b9aaabe1af 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -318,7 +318,7 @@ void sceneHandler08_badLuck() {
 
 	ExCommand *ex = new ExCommand(g_fp->_aniMan->_id, 1, MV_MAN8_BADLUCK, 0, 0, 0, 1, 0, 0, 0);
 	ex->_excFlags |= 2;
-	ex->_param = g_fp->_aniMan->_okeyCode;
+	ex->_param = g_fp->_aniMan->_odelay;
 	mq->addExCommandToEnd(ex);
 
 	mq->setFlags(mq->getFlags() | 1);
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 3086cf0cfc..3219454987 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -486,7 +486,7 @@ void sceneHandler09_ballExplode(Ball *ball) {
 
 	MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC9_BALLEXPLODE), 0, 1);
 
-	mq->setParamInt(-1, ball->ani->_okeyCode);
+	mq->setParamInt(-1, ball->ani->_odelay);
 
 	if (!mq->chain(ball->ani))
 		delete mq;
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index adcc0b7984..0e072094d7 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -143,13 +143,13 @@ void sceneHandler14_showBallGrandmaHit() {
 		MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
 		ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0);
 
-		ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+		ex->_param = g_vars->scene14_flyingBall->_odelay;
 		ex->_excFlags |= 2;
 		ex->_field_24 = 1;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0);
-		ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+		ex->_param = g_vars->scene14_flyingBall->_odelay;
 		ex->_excFlags |= 3;
 		mq->addExCommandToEnd(ex);
 		mq->chain(0);
@@ -185,13 +185,13 @@ void sceneHandler14_showBallMan() {
 		MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
 		ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_TOGMA, 0, 0, 0, 1, 0, 0, 0);
 
-		ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+		ex->_param = g_vars->scene14_flyingBall->_odelay;
 		ex->_excFlags |= 2;
 		ex->_field_24 = 1;
 		mq->addExCommandToEnd(ex);
 
 		ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0);
-		ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+		ex->_param = g_vars->scene14_flyingBall->_odelay;
 		ex->_excFlags |= 3;
 		mq->addExCommandToEnd(ex);
 		mq->chain(0);
@@ -501,13 +501,13 @@ void sceneHandler14_passToGrandma() {
 	MessageQueue *mq = new MessageQueue(g_fp->_globalMessageQueueList->compact());
 	ExCommand *ex = new ExCommand(ANI_BALL14, 1, MV_BAL14_FALL, 0, 0, 0, 1, 0, 0, 0);
 
-	ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+	ex->_param = g_vars->scene14_flyingBall->_odelay;
 	ex->_excFlags |= 2;
 	ex->_field_24 = 1;
 	mq->addExCommandToEnd(ex);
 
 	ex = new ExCommand(ANI_BALL14, 6, 0, 0, 0, 0, 1, 0, 0, 0);
-	ex->_param = g_vars->scene14_flyingBall->_okeyCode;
+	ex->_param = g_vars->scene14_flyingBall->_odelay;
 	ex->_excFlags |= 3;
 	mq->addExCommandToEnd(ex);
 	mq->chain(0);
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index cb21f28103..89b797757b 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -181,7 +181,7 @@ void sceneHandler16_fillMug() {
 		if (g_vars->scene16_walkingBoy) {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
 
-			mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode);
+			mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay);
 			if (mq->chain(g_vars->scene16_walkingBoy))
 				return;
 		} else {
@@ -190,7 +190,7 @@ void sceneHandler16_fillMug() {
 
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
 
-			mq->setParamInt(-1, g_vars->scene16_walkingGirl->_okeyCode);
+			mq->setParamInt(-1, g_vars->scene16_walkingGirl->_odelay);
 			if (mq->chain(g_vars->scene16_walkingGirl))
 				return;
 		}
@@ -208,7 +208,7 @@ void sceneHandler16_fillMug() {
 	if (g_vars->scene16_walkingBoy) {
 		mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
 
-		mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay);
 
 		ani = g_vars->scene16_walkingBoy;
 	} else {
@@ -217,7 +217,7 @@ void sceneHandler16_fillMug() {
 
 		mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
 
-		mq->setParamInt(-1, g_vars->scene16_walkingGirl->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene16_walkingGirl->_odelay);
 		ani = g_vars->scene16_walkingGirl;
 	}
 
@@ -232,7 +232,7 @@ void sceneHandler16_startLaugh() {
 
 	MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLLAUGH), 0, 1);
 
-	mq->setParamInt(-1, girl->_okeyCode);
+	mq->setParamInt(-1, girl->_odelay);
 	mq->setFlags(mq->getFlags() | 1);
 	mq->chain(0);
 
@@ -258,7 +258,7 @@ void sceneHandler16_drink() {
 
 							mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYKICK), 0, 1);
 
-							mq->setParamInt(-1, g_vars->scene16_walkingBoy->_okeyCode);
+							mq->setParamInt(-1, g_vars->scene16_walkingBoy->_odelay);
 
 							ex = new ExCommand(ANI_MAN, 34, 384, 0, 0, 0, 1, 0, 0, 0);
 							ex->_excFlags |= 3u;
@@ -361,7 +361,7 @@ void sceneHandler16_putOnWheel() {
 		if (ani->_id == ANI_BOY) {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GOBOY), 0, 1);
 
-			mq->setParamInt(-1, ani->_okeyCode);
+			mq->setParamInt(-1, ani->_odelay);
 			mq->chain(0);
 
 			g_vars->scene16_walkingBoy = ani;
@@ -370,7 +370,7 @@ void sceneHandler16_putOnWheel() {
 			if (g_fp->getObjectState(sO_Girl) == g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging)) {
 				mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GOGIRL), 0, 1);
 
-				mq->setParamInt(-1, ani->_okeyCode);
+				mq->setParamInt(-1, ani->_odelay);
 				mq->chain(0);
 
 				g_vars->scene16_walkingBoy = 0;
diff --git a/engines/fullpipe/scenes/scene23.cpp b/engines/fullpipe/scenes/scene23.cpp
index 2bb928f007..a2d4f01f2b 100644
--- a/engines/fullpipe/scenes/scene23.cpp
+++ b/engines/fullpipe/scenes/scene23.cpp
@@ -351,7 +351,7 @@ void sceneHandler23_pushButton(ExCommand *cmd) {
 
 void sceneHandler23_sendClick(StaticANIObject *ani) {
 	int msg = 0;
-	switch (ani->_okeyCode) {
+	switch (ani->_odelay) {
 	case 0:
 		msg = MSG_SC23_CLICKBTN1;
 		break;
diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
index bb05e2f197..dfb767ee91 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/fullpipe/scenes/scene25.cpp
@@ -234,7 +234,7 @@ void sceneHandler25_animateBearders() {
 
 		mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED), 0, 1);
 
-		mq->setParamInt(-1, g_vars->scene25_bearders[0]->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene25_bearders[0]->_odelay);
 		mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100;
 		mq->chain(0);
 
@@ -243,14 +243,14 @@ void sceneHandler25_animateBearders() {
 		if (g_fp->_rnd->getRandomNumber(32767) < 0x1FFF) {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED2), 0, 1);
 
-			mq->setParamInt(-1, g_vars->scene25_bearders[1]->_okeyCode);
+			mq->setParamInt(-1, g_vars->scene25_bearders[1]->_odelay);
 			mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100;
 			mq->chain(0);
 
 			if (g_fp->_rnd->getRandomNumber(32767) < 8191) {
 				mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC25_BEARDED3), 0, 1);
 
-				mq->setParamInt(-1, g_vars->scene25_bearders[2]->_okeyCode);
+				mq->setParamInt(-1, g_vars->scene25_bearders[2]->_odelay);
 				mq->getExCommandByIndex(0)->_x = g_fp->_rnd->getRandomNumber(650) + 100;
 				mq->chain(0);
 			}
diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp
index df7accc959..d183ee9da8 100644
--- a/engines/fullpipe/scenes/scene26.cpp
+++ b/engines/fullpipe/scenes/scene26.cpp
@@ -120,7 +120,7 @@ void sceneHandler26_testVent() {
 	if (!g_vars->scene26_activeVent)
 		return;
 
-	if (g_vars->scene26_activeVent->_okeyCode == 0) {
+	if (g_vars->scene26_activeVent->_odelay == 0) {
 		if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Opened))
 			g_fp->stopAllSoundInstances(SND_26_018);
 		else
@@ -137,7 +137,7 @@ void sceneHandler26_testVent() {
 
 			g_fp->playSound(SND_26_020, 0);
 		}
-	} else if (g_vars->scene26_activeVent->_okeyCode == 1) {
+	} else if (g_vars->scene26_activeVent->_odelay == 1) {
 		if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Opened))
 			g_fp->playSound(SND_26_020, 0);
 		else
@@ -152,7 +152,7 @@ void sceneHandler26_testVent() {
 
 			chainQueue(QU_SC26_AUTOCLOSE1, 0);
 		}
-	} else if (g_vars->scene26_activeVent->_okeyCode == 2) {
+	} else if (g_vars->scene26_activeVent->_odelay == 2) {
 		if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Opened))
 			g_fp->playSound(SND_26_020, 0);
 		else
@@ -195,7 +195,7 @@ void sceneHandler26_hideVent() {
 void sceneHandler26_animateVents(StaticANIObject *ani) {
 	int qId = 0;
 
-	switch (ani->_okeyCode) {
+	switch (ani->_odelay) {
 	case 0:
 		if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Closed))
 			qId = QU_SC26_OPEN1;
@@ -249,7 +249,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) {
 }
 
 void sceneHandler26_clickVent(StaticANIObject *ani, ExCommand *cmd) {
-	if (ani->_okeyCode || g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_Opened)) {
+	if (ani->_odelay || g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_Opened)) {
 		if (g_fp->_aniMan->isIdle() && !(g_fp->_aniMan->_flags & 0x100)) {
 			g_vars->scene26_activeVent = ani;
 
@@ -263,7 +263,7 @@ void sceneHandler26_clickVent(StaticANIObject *ani, ExCommand *cmd) {
 					ExCommand *ex = new ExCommand(0, 17, MSG_SC26_CLICKVENT, 0, 0, 0, 1, 0, 0, 0);
 
 					ex->_excFlags |= 3;
-					ex->_param = ani->_okeyCode;
+					ex->_param = ani->_odelay;
 
 					mq->addExCommandToEnd(ex);
 
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index c8a7bae4c7..93ff53f996 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -191,7 +191,7 @@ void sceneHandler27_showNextBat() {
 	if (g_vars->scene27_bat) {
 		MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC27_SHOWBET), 0, 1);
 
-		mq->setParamInt(-1, g_vars->scene27_bat->_okeyCode);
+		mq->setParamInt(-1, g_vars->scene27_bat->_odelay);
 		mq->chain(0);
 	}
 
diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
index f096e6964b..d7d2d213ee 100644
--- a/engines/fullpipe/scenes/scene28.cpp
+++ b/engines/fullpipe/scenes/scene28.cpp
@@ -405,7 +405,7 @@ int sceneHandler28(ExCommand *cmd) {
 
 			if (ani)
 				if (ani->_id == ANI_LIFT || ani->_id == ANI_LIFT_28 ) {
-					sceneHandler28_clickLift(ani->_okeyCode);
+					sceneHandler28_clickLift(ani->_odelay);
 
 					cmd->_messageKind = 0;
 					break;
diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 80f82e09cd..c29dac0bab 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -510,7 +510,7 @@ void sceneHandler29_manHit() {
 		if (g_vars->scene29_manX <= 638) {
 			ex = new ExCommand(ANI_MAN, 1, MV_MAN29_STANDUP_NORM, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags = 2;
-			ex->_param = g_fp->_aniMan->_okeyCode;
+			ex->_param = g_fp->_aniMan->_odelay;
 			mq->addExCommandToEnd(ex);
 
 			ex = new ExCommand(0, 17, MSG_SC29_STOPRIDE, 0, 0, 0, 1, 0, 0, 0);
@@ -524,7 +524,7 @@ void sceneHandler29_manHit() {
 		} else {
 			ex = new ExCommand(ANI_MAN, 1, MV_MAN29_STANDUP, 0, 0, 0, 1, 0, 0, 0);
 			ex->_excFlags = 2;
-			ex->_param = g_fp->_aniMan->_okeyCode;
+			ex->_param = g_fp->_aniMan->_odelay;
 			mq->addExCommandToEnd(ex);
 		}
 
@@ -878,7 +878,7 @@ void sceneHandler29_animBearded() {
 				if (x - g_vars->scene29_manX < 100 || !g_vars->scene29_arcadeIsOn) {
 					mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC29_BRDOUT1), 0, 1);
 
-					mq->setParamInt(-1, ani->_okeyCode);
+					mq->setParamInt(-1, ani->_odelay);
 					mq->chain(0);
 
 					g_vars->scene29_bearders[i]->wbflag = 0;
@@ -898,7 +898,7 @@ void sceneHandler29_animBearded() {
 
 						mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC29_BRDOUT2), 0, 1);
 
-						mq->setParamInt(-1, ani->_okeyCode);
+						mq->setParamInt(-1, ani->_odelay);
 						mq->chain(0);
 
 						g_vars->scene29_bearders[i]->wbflag = 0;
@@ -939,7 +939,7 @@ void sceneHandler29_animBearded() {
 			}
 
 			mq->getExCommandByIndex(0)->_x = newx;
-			mq->setParamInt(-1, ani->_okeyCode);
+			mq->setParamInt(-1, ani->_odelay);
 			mq->chain(0);
 
 			g_vars->scene29_bearders[i]->wbflag = 1;
diff --git a/engines/fullpipe/scenes/scene32.cpp b/engines/fullpipe/scenes/scene32.cpp
index 1766d790b8..e1c999d754 100644
--- a/engines/fullpipe/scenes/scene32.cpp
+++ b/engines/fullpipe/scenes/scene32.cpp
@@ -185,7 +185,7 @@ void sceneHandler32_trySit(ExCommand *cmd) {
 		ex->_parentId = ANI_MAN;
 		ex->_messageKind = 1;
 		ex->_messageNum = MV_MAN32_SITDOWN;
-		ex->_param = g_fp->_aniMan->_okeyCode;
+		ex->_param = g_fp->_aniMan->_odelay;
 
 		g_vars->scene32_dudeIsSitting = true;
 
diff --git a/engines/fullpipe/scenes/scene33.cpp b/engines/fullpipe/scenes/scene33.cpp
index f9fdcdf9cc..6a58cdf694 100644
--- a/engines/fullpipe/scenes/scene33.cpp
+++ b/engines/fullpipe/scenes/scene33.cpp
@@ -107,7 +107,7 @@ void sceneHandler33_switchVent(StaticANIObject *ani) {
 	if (mv)
 		ani->startAnim(mv, 0, -1);
 
-	g_vars->scene33_ventsState[ani->_okeyCode] = !g_vars->scene33_ventsState[ani->_okeyCode];
+	g_vars->scene33_ventsState[ani->_odelay] = !g_vars->scene33_ventsState[ani->_odelay];
 }
 
 void sceneHandler33_processVents() {
@@ -169,7 +169,7 @@ void sceneHandler33_zoneClickProcess(StaticANIObject *ani) {
 		StaticANIObject *vent1 = 0;
 		StaticANIObject *vent2 = 0;
 
-		switch (ani->_okeyCode) {
+		switch (ani->_odelay) {
 		case 0:
 			vent1 = g_fp->_currentScene->getStaticANIObject1ById(ANI_VENT_33, 2);
 			vent2 = g_fp->_currentScene->getStaticANIObject1ById(ANI_VENT_33, 3);