aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe
diff options
context:
space:
mode:
authorEugene Sandulenko2013-12-05 22:44:32 +0200
committerEugene Sandulenko2013-12-05 22:44:32 +0200
commit580bfc259b0f2c582443b5938eecb6216e743d2e (patch)
tree5c93d7da7e2f75bca737f6ab5680115503ca1a99 /engines/fullpipe
parent6b5a8a8f0ed5241b536277e6f901a6ca2ddd2bce (diff)
downloadscummvm-rg350-580bfc259b0f2c582443b5938eecb6216e743d2e.tar.gz
scummvm-rg350-580bfc259b0f2c582443b5938eecb6216e743d2e.tar.bz2
scummvm-rg350-580bfc259b0f2c582443b5938eecb6216e743d2e.zip
FULLPIPE: Unstub sceneHandler04_sub17()
Diffstat (limited to 'engines/fullpipe')
-rw-r--r--engines/fullpipe/motion.cpp6
-rw-r--r--engines/fullpipe/motion.h1
-rw-r--r--engines/fullpipe/scenes/scene04.cpp4
3 files changed, 7 insertions, 4 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index b2d44a302a..28201c535d 100644
--- 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
index 85d7144f0b..9e1e42aaa4 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -175,6 +175,7 @@ public:
public:
MctlLadder();
+ int collisionDetection(StaticANIObject *man);
};
class MovGraphNode : public CObject {
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index b906b1bc2e..689260a41b 100644
--- 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() {