[Scummvm-cvs-logs] scummvm master -> 580bfc259b0f2c582443b5938eecb6216e743d2e
sev-
sev at scummvm.org
Thu Dec 5 21:45:27 CET 2013
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b7d67724b5 FULLPIPE: Implement sceneHandler04_manFromBottle()
6b5a8a8f0e FULLPIPE: Stub MctlLadder class
580bfc259b FULLPIPE: Unstub sceneHandler04_sub17()
Commit: b7d67724b5572131c79a81cb52be2bc5ac6a67e3
https://github.com/scummvm/scummvm/commit/b7d67724b5572131c79a81cb52be2bc5ac6a67e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-05T12:24:31-08:00
Commit Message:
FULLPIPE: Implement sceneHandler04_manFromBottle()
Changed paths:
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 0a0b804..78cf488 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -319,7 +319,20 @@ void sceneHandler04_lowerPlank() {
}
void sceneHandler04_manFromBottle() {
- warning("sceneHandler04_manFromBottle()");
+ for (Common::List<GameObject *>::iterator it = g_vars->scene04_bottleObjList.begin(); it != g_vars->scene04_bottleObjList.end(); ++it)
+ if (*it == g_fullpipe->_aniMan) {
+ g_vars->scene04_bottleObjList.erase(it);
+ g_vars->scene04_var06 -= 9;
+ break;
+ }
+
+ //if (g_vars->scene04_ladder)
+ // delete g_vars->scene04_ladder;
+
+ //g_vars->scene04_ladder = 0;
+
+ getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId)->setEnabled();
+ getGameLoaderInteractionController()->enableFlag24();
}
void sceneHandler04_manToBottle() {
Commit: 6b5a8a8f0ed5241b536277e6f901a6ca2ddd2bce
https://github.com/scummvm/scummvm/commit/6b5a8a8f0ed5241b536277e6f901a6ca2ddd2bce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-05T12:41:02-08:00
Commit Message:
FULLPIPE: Stub MctlLadder class
Changed paths:
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene04.cpp
engines/fullpipe/utils.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index f67011a..b2d44a3 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,22 @@ 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;
+}
+
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 bab0ffc..85d7144 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -161,6 +161,22 @@ public:
MessageQueue *genMovement(MGMInfo *mgminfo);
};
+class MctlLadder : public MotionController {
+public:
+ int _ladder_field_C;
+ int _ladder_field_10;
+ int _ladder_field_14;
+ int _ladder_field_18;
+ int _ladder_field_1C;
+ int _ladder_field_20;
+ int _ladder_field_24;
+ PreloadItem _preload;
+ MGM _mgm;
+
+public:
+ MctlLadder();
+};
+
class MovGraphNode : public CObject {
public:
int _x;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 670b94a..ced671d 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -26,6 +26,7 @@
namespace Fullpipe {
class StaticANIObject;
+ class MctlLadder;
int defaultUpdateCursor();
@@ -93,7 +94,7 @@ public:
Common::List<GameObject *> scene04_bottleObjList;
Common::List<StaticANIObject *> scene04_kozyawkiAni;
- int scene04_ladder;
+ MctlLadder *scene04_ladder;
bool scene04_coinPut;
bool scene04_soundPlaying;
int scene04_dynamicPhaseIndex;
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 78cf488..b906b1b 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -326,10 +326,10 @@ void sceneHandler04_manFromBottle() {
break;
}
- //if (g_vars->scene04_ladder)
- // delete g_vars->scene04_ladder;
+ if (g_vars->scene04_ladder)
+ delete g_vars->scene04_ladder;
- //g_vars->scene04_ladder = 0;
+ g_vars->scene04_ladder = 0;
getSc2MctlCompoundBySceneId(g_fullpipe->_currentScene->_sceneId)->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp
index 3a65801..063aa5c 100644
--- a/engines/fullpipe/utils.cpp
+++ b/engines/fullpipe/utils.cpp
@@ -26,6 +26,7 @@
#include "common/memstream.h"
#include "fullpipe/objects.h"
+#include "fullpipe/gameloader.h"
#include "fullpipe/motion.h"
#include "fullpipe/ngiarchive.h"
#include "fullpipe/messages.h"
Commit: 580bfc259b0f2c582443b5938eecb6216e743d2e
https://github.com/scummvm/scummvm/commit/580bfc259b0f2c582443b5938eecb6216e743d2e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-05T12:44:32-08:00
Commit Message:
FULLPIPE: Unstub sceneHandler04_sub17()
Changed paths:
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index b2d44a3..28201c5 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 85d7144..9e1e42a 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 b906b1b..689260a 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() {
More information about the Scummvm-git-logs
mailing list