FULLPIPE: Unstub sceneHandler04_sub17()

scummvm · Dec 5, 2013 · 580bfc2 · 580bfc2
1 parent 6b5a8a8
commit 580bfc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
@@ -201,6 +201,12 @@ MctlLadder::MctlLadder() {
 	_ladder_field_24 = 0;
 }
 
+int MctlLadder::collisionDetection(StaticANIObject *man) {
+	warning("STUB: MctlLaddercollisionDetection()");
+
+	return 0;
+}
+
 MctlConnectionPoint *MctlCompound::findClosestConnectionPoint(int ox, int oy, int destIndex, int connectionX, int connectionY, int sourceIndex, int *minDistancePtr) {
 	warning("STUB: MctlCompound::findClosestConnectionPoint()");
 

diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
@@ -175,6 +175,7 @@ class MctlLadder : public MotionController {
 
 public:
 	MctlLadder();
+	int collisionDetection(StaticANIObject *man);
 };
 
 class MovGraphNode : public CObject {

diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
@@ -474,7 +474,6 @@ void sceneHandler04_handTake() {
 }
 
 void sceneHandler04_sub17() {
-#if 0
 	StaticANIObject *ball =  g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_BIGBALL, -1);
 
 	if (g_vars->scene04_var01
@@ -494,9 +493,6 @@ void sceneHandler04_sub17() {
 			g_vars->scene04_var14 = 0;
 		}
 	}
-#endif
-
-	warning("sceneHandler04_sub17()");
 }
 
 void sceneHandler04_takeBottle() {