Merge branch 'master' of github.com:scummvm/scummvm

1 files changed, 23 insertions, 1 deletions

diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index f67011a50f..28201c535d 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -28,9 +28,9 @@
 
 #include "fullpipe/objects.h"
 #include "fullpipe/statics.h"
+#include "fullpipe/gameloader.h"
 #include "fullpipe/motion.h"
 #include "fullpipe/messages.h"
-#include "fullpipe/gameloader.h"
 
 namespace Fullpipe {
 
@@ -185,6 +185,28 @@ MessageQueue *MctlCompound::doWalkTo(StaticANIObject *subj, int xpos, int ypos,
 	return mq;
 }
 
+MctlLadder::MctlLadder() {
+	_preload.preloadId1 = 0;
+	_preload.keyCode = 0;
+	_preload.sceneId = 0;
+	_preload.preloadId2 = 0;
+
+	_ladder_field_18 = 0;
+	_ladder_field_C = 0;
+	_ladder_field_1C = 0;
+	_ladder_field_10 = 0;
+	_ladder_field_14 = 0;
+
+	_ladder_field_20 = 0;
+	_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()");