[Scummvm-cvs-logs] scummvm master -> 5253021fbd067f3d27f00f37ad4f34649e24166e
sev-
sev at scummvm.org
Thu Dec 19 23:18:35 CET 2013
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bf59b074d2 FULLPIPE: Make scene08_initScene() compilable
f91f043b10 FULLPIPE: Remove logically dead code. CID 1138359
0ebca03355 FULLPIPE: Fix explicit null dereference. CID 1138360
b8fcaae643 FULLPIPE: Fix explicit null dereference. CID 1138361
5253021fbd FULLPIPE: Remove explicit null check. CID 1138364
Commit: bf59b074d287a9c38ea64148c2bd5f4a4e6e29b4
https://github.com/scummvm/scummvm/commit/bf59b074d287a9c38ea64148c2bd5f4a4e6e29b4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-19T14:17:41-08:00
Commit Message:
FULLPIPE: Make scene08_initScene() compilable
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/module.mk
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene08.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index fdf0874..1e14585 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -26,12 +26,14 @@
namespace Fullpipe {
#define ANI_BALLDROP 2685
+#define ANI_BATUTA 737
#define ANI_BIGBALL 4923
#define ANI_BIGLUK 909
#define ANI_BOOT_1 4231
#define ANI_BUTTON 598
#define ANI_BUTTON_6 2988
#define ANI_CLOCK 588
+#define ANI_CLOCK_8 2989
#define ANI_CORNERSITTER 71
#define ANI_DOMINO_3 2732
#define ANI_DADAYASHIK 306
@@ -65,6 +67,7 @@ namespace Fullpipe {
#define ANI_SC7_BOX 791
#define ANI_SPEAKER_4 3275
#define ANI_SPRING 542
+#define ANI_VMYATS 764
#define MSG_CLICKBOTTLE 569
#define MSG_CLICKBUTTON 609
#define MSG_CLICKPLANK 549
@@ -148,6 +151,7 @@ namespace Fullpipe {
#define MSG_UPDATEBOTTLE 613
#define MV_BLK_CLOSE 911
#define MV_BLK_OPEN 910
+#define MV_CLK8_GO 2990
#define MV_CST_CLOSELUKE 807
#define MV_EGTR_FATASK 5332
#define MV_IN1MAN_SLEEP 5111
@@ -263,6 +267,8 @@ namespace Fullpipe {
#define PIC_SC4_MASK 585
#define PIC_SC4_PLANK 5183
#define PIC_SC6_LADDER 1104
+#define PIC_SC8_ARCADENOW 1043
+#define PIC_SC8_LADDER 754
#define PIC_SCD_SEL 734
#define QU_BALL_WALKL 4920
#define QU_BALL_WALKR 4919
@@ -364,6 +370,10 @@ namespace Fullpipe {
#define SND_INTR_019 5220
#define ST_BLK_CLOSED 912
#define ST_BLK_OPEN 913
+#define ST_BTT_CHESHET 746
+#define ST_BTT_NOSPOON 739
+#define ST_BTT_SLEEPS 748
+#define ST_BTT_SPOON 741
#define ST_CLK_CLOSED 590
#define ST_CST_HANDLELESS 794
#define ST_DYAS_LIES 318
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 7c09811..d3af88d 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -31,6 +31,7 @@ MODULE_OBJS = \
scenes/scene05.o \
scenes/scene06.o \
scenes/scene07.o \
+ scenes/scene08.o \
scenes/sceneDbg.o \
scenes/sceneIntro.o
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 44cf550..3d8d662 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -46,6 +46,12 @@ void MotionController::enableLinks(const char *linkName, bool enable) {
warning("STUB: MotionController::enableLinks()");
}
+MovGraphLink *MotionController::getLinkByName(const char *name) {
+ warning("STUB: MotionController::getLinkByName()");
+
+ return 0;
+}
+
bool MctlCompound::load(MfcArchive &file) {
debug(5, "MctlCompound::load()");
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index ee4ad02..029b25b 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -28,6 +28,7 @@ namespace Fullpipe {
class Statics;
class Movement;
class MctlConnectionPoint;
+class MovGraphLink;
int startWalkTo(int objId, int objKey, int x, int y, int a5);
int doSomeAnimation(int objId, int objKey, int a3);
@@ -61,6 +62,7 @@ public:
virtual MessageQueue *doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) { return 0; }
void enableLinks(const char *linkName, bool enable);
+ MovGraphLink *getLinkByName(const char *name);
};
class MovGraphReact : public CObject {
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 5c61088..6e59ade 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -143,6 +143,17 @@ Vars::Vars() {
scene07_lukePercent = 0;
scene07_plusMinus = 0;
+ scene08_batuta = 0;
+ scene08_vmyats = 0;
+ scene08_clock = 0;
+ scene08_var01 = 0;
+ scene08_var02 = 0;
+ scene08_var03 = 0;
+ scene08_var04 = 0;
+ scene08_var05 = 0;
+ scene08_var06 = 0;
+ scene08_var07 = 0;
+
selector = 0;
}
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0070d10..11b0170 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -184,6 +184,17 @@ public:
int scene07_lukePercent;
StaticANIObject *scene07_plusMinus;
+ StaticANIObject *scene08_batuta;
+ StaticANIObject *scene08_vmyats;
+ StaticANIObject *scene08_clock;
+ int scene08_var01;
+ int scene08_var02;
+ int scene08_var03;
+ int scene08_var04;
+ int scene08_var05;
+ int scene08_var06;
+ int scene08_var07;
+
PictureObject *selector;
};
diff --git a/engines/fullpipe/scenes/scene08.cpp b/engines/fullpipe/scenes/scene08.cpp
index 82dbd7d..9b71b54 100644
--- a/engines/fullpipe/scenes/scene08.cpp
+++ b/engines/fullpipe/scenes/scene08.cpp
@@ -27,6 +27,10 @@
#include "fullpipe/constants.h"
#include "fullpipe/scenes.h"
#include "fullpipe/scene.h"
+#include "fullpipe/statics.h"
+#include "fullpipe/floaters.h"
+#include "fullpipe/motion.h"
+#include "fullpipe/gameloader.h"
namespace Fullpipe {
@@ -53,7 +57,7 @@ void scene08_initScene(Scene *sc) {
if (batuta == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsEating)) {
g_vars->scene08_batuta->changeStatics2(ST_BTT_SPOON);
} else if (batuta == g_fullpipe->getObjectEnumState(sO_TummyTrampie, sO_IsDrinking)) {
- g_vars->scene08_batuta->changeStatics2(g_vars->scene08_batuta, ST_BTT_NOSPOON);
+ g_vars->scene08_batuta->changeStatics2(ST_BTT_NOSPOON);
g_vars->scene08_clock->startAnim(MV_CLK8_GO, 0, -1);
g_vars->scene08_clock->_movement->setDynamicPhaseIndex(3);
@@ -90,10 +94,10 @@ void scene08_initScene(Scene *sc) {
g_fullpipe->_currentScene = oldsc;
- g_fullpipe->_floaters->init(getGameLoaderGameVar()->getSubVarByName("SC_8"));
+ g_fullpipe->_floaters->init(g_fullpipe->getGameLoaderGameVar()->getSubVarByName("SC_8"));
g_fullpipe->_floaters->genFlies(sc, 100, 100, 0, 0);
- setArcadeOverlay(PIC_CSR_ARCADE3);
+ g_fullpipe->setArcadeOverlay(PIC_CSR_ARCADE3);
}
} // End of namespace Fullpipe
Commit: f91f043b103099873ef2ff691c9bd2fc3f2863c8
https://github.com/scummvm/scummvm/commit/f91f043b103099873ef2ff691c9bd2fc3f2863c8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-19T14:17:42-08:00
Commit Message:
FULLPIPE: Remove logically dead code. CID 1138359
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 3d8d662..ab8815e 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -318,9 +318,6 @@ MessageQueue *MctlLadder::method34(StaticANIObject *subj, int xpos, int ypos, in
if (mq) {
if (mq->chain(subj))
return mq;
-
- } else {
- delete mq;
}
return 0;
Commit: 0ebca033559b27903278369b5d18ebc54560c431
https://github.com/scummvm/scummvm/commit/0ebca033559b27903278369b5d18ebc54560c431
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-19T14:17:42-08:00
Commit Message:
FULLPIPE: Fix explicit null dereference. CID 1138360
Changed paths:
engines/fullpipe/motion.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index ab8815e..727cb4c 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1566,9 +1566,13 @@ void MGM::updateAnimStatics(StaticANIObject *ani, int staticsId) {
ani->queueMessageQueue(0);
ani->_movement->gotoLastFrame();
ani->_statics = ani->_movement->_staticsObj2;
+
+ int x = ani->_movement->_ox;
+ int y = ani->_movement->_oy;
+
ani->_movement = 0;
- ani->setOXY(ani->_movement->_ox, ani->_movement->_oy);
+ ani->setOXY(x, y);
}
if (ani->_statics) {
Commit: b8fcaae6438ef06d13a3c16b21ea2a2cae49f162
https://github.com/scummvm/scummvm/commit/b8fcaae6438ef06d13a3c16b21ea2a2cae49f162
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-19T14:17:42-08:00
Commit Message:
FULLPIPE: Fix explicit null dereference. CID 1138361
Changed paths:
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 28b2d77..c8712d2 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -982,6 +982,10 @@ void sceneHandler04_leaveScene() {
}
}
+ if (!ex) {
+ error("sceneHandler04_leaveScene(): Cannot find exit");
+ }
+
ex->_y = g_vars->scene04_bottle->_oy - 304;
mq->chain(0);
Commit: 5253021fbd067f3d27f00f37ad4f34649e24166e
https://github.com/scummvm/scummvm/commit/5253021fbd067f3d27f00f37ad4f34649e24166e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-19T14:17:42-08:00
Commit Message:
FULLPIPE: Remove explicit null check. CID 1138364
Changed paths:
engines/fullpipe/scenes/scene04.cpp
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index c8712d2..6c9e9c6 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -1115,7 +1115,7 @@ void sceneHandler04_leaveLadder(ExCommand *ex) {
mc->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
- } else if (mq) {
+ } else {
delete mq;
}
More information about the Scummvm-git-logs
mailing list