FULLPIPE: Mass fix incorrect inhibitor flag

scummvm · Sep 17, 2016 · 34b266b · 34b266b
1 parent ec378ac
commit 34b266b
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp
@@ -290,8 +290,8 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
 			return false;
 		}
 
-		subj->_flags |= 1;
-		obj->_flags |= 1;
+		subj->_flags |= 0x100;
+		obj->_flags |= 0x100;
 	} else {
 		bool someFlag = false;
 		PicAniInfo aniInfo;
@@ -389,7 +389,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
 				ani->queueMessageQueue(mq);
 			}
 		} else {
-			obj->_flags |= 1;
+			obj->_flags |= 0x100;
 
 			if (inter->_flags & 0x10000)
 				return true;

diff --git a/engines/fullpipe/lift.cpp b/engines/fullpipe/lift.cpp
@@ -358,7 +358,7 @@ void FullpipeEngine::lift_walkAndGo() {
 
 		mq->chain(0);
 
-		_aniMan->_flags |= 1;
+		_aniMan->_flags |= 0x100;
 	}
 }
 
@@ -423,12 +423,12 @@ void FullpipeEngine::lift_goAnimation() {
 
 				mq->addExCommandToEnd(ex);
 
-				_aniMan->_flags &= 0xFEFF;
+				_aniMan->_flags &= ~0x100;
 
 				if (!mq->chain(_aniMan))
 					delete mq;
 
-				_aniMan->_flags |= 1;
+				_aniMan->_flags |= 0x100;
 
 				return;
 			}

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
@@ -413,7 +413,7 @@ void sceneHandler04_jumpOnLadder() {
 
 	g_fp->_aniMan->changeStatics2(ST_MAN_LADDERDOWN);
 
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 
 	AniHandler aniHandler;
 	MakeQueueStruct mkQueue;
@@ -527,7 +527,7 @@ void sceneHandler04_gotoLadder(ExCommand *ex) {
 
 		if (mq->chain(g_fp->_aniMan)) {
 			g_fp->_aniMan->_priority = 12;
-			g_fp->_aniMan->_flags |= 1;
+			g_fp->_aniMan->_flags |= 0x100;
 		} else {
 			delete mq;
 		}

diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
@@ -269,7 +269,7 @@ void sceneHandler16_drink() {
 							mq->setFlags(mq->getFlags() | 1);
 							mq->chain(0);
 						} else {
-							g_fp->_aniMan->_flags |= 1;
+							g_fp->_aniMan->_flags |= 0x100;
 
 							mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_MANDRINK), 0, 1);
 

diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
@@ -538,7 +538,7 @@ void sceneHandler18and19_girlJumpTo() {
 
 void sceneHandler18and19_manStandArmchair() {
 	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 	g_fp->_aniMan->_priority = 35;
 	g_fp->_aniMan->startAnim(MV_MAN18_STANDKRESLO, 0, -1);
 }

diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
@@ -516,7 +516,7 @@ void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, Messa
 		ani->restartMessageQueue(mq);
 	}
 
-	ani->_flags |= 1;
+	ani->_flags |= 0x100;
 }
 
 bool sceneHandler25_isOnLadder(ExCommand *cmd) {

diff --git a/engines/fullpipe/scenes/scene28.cpp b/engines/fullpipe/scenes/scene28.cpp
@@ -204,7 +204,7 @@ void sceneHandler28_lift0Start() {
 }
 
 void sceneHandler28_lift1Start() {
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 
 	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
 
@@ -220,7 +220,7 @@ void sceneHandler28_lift3Start() {
 }
 
 void sceneHandler28_lift4Start() {
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 
 	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
 
@@ -232,7 +232,7 @@ void sceneHandler28_lift5Start() {
 }
 
 void sceneHandler28_lift6Start() {
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 
 	g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
 

diff --git a/engines/fullpipe/scenes/scene34.cpp b/engines/fullpipe/scenes/scene34.cpp
@@ -189,7 +189,7 @@ void sceneHandler34_fromCactus(ExCommand *cmd) {
 	mq->setFlags(mq->getFlags() | 1);
 	mq->chain(0);
 
-	g_fp->_aniMan->_flags |= 1;
+	g_fp->_aniMan->_flags |= 0x100;
 }
 
 void sceneHandler34_animateLeaveBoard(ExCommand *cmd) {

diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp
@@ -88,7 +88,7 @@ void sceneHandler35_startFlow() {
 			g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene35_bellyInflater, ST_PDV_SMALL, QU_PDV_SML_TRY, 0);
 
 			g_vars->scene35_bellyInflater->changeStatics2(ST_PDV_SMALL);
-			g_vars->scene35_bellyInflater->_flags &= 0xFEFF;
+			g_vars->scene35_bellyInflater->_flags &= ~0x100;
 
 			MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC35_EATHOZE), 0, 0);
 
@@ -105,7 +105,7 @@ void sceneHandler35_startFlow() {
 			if (!mq->chain(g_vars->scene35_bellyInflater))
 				delete mq;
 
-			g_vars->scene35_bellyInflater->_flags |= 1;
+			g_vars->scene35_bellyInflater->_flags |= 0x100;
 
 			getCurrSceneSc2MotionController()->enableLinks(sO_CloseThing, 1);