[Scummvm-cvs-logs] scummvm master -> 2b2157cf620da980bb8bad0adcf43fef4b4d40a8

sev- sev at scummvm.org
Sun Sep 22 10:43:41 CEST 2013


This automated email contains information about 7 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
19955e5d19 FULLPIPE: Fix stupid c/p error. CID 1063216
2fb823c19b FULLPIPE: Fix unneeded check. CID 1063206
0b88ffab1b FULLPIPE: Fix uninitialized class variables
4d52f7b701 FULLPIPE: Remove unused class variable. CID 1063191
3329dc8fe0 FULLPIPE: Initialized class variables. CID 1063198
6e7f4d3669 FULLPIPE: Initialize class variable
2b2157cf62 FULLPIPE: Initialize class variable in constructor. CID 1090697


Commit: 19955e5d1943309c9ac2d696d9ee22eb4dee4eb9
    https://github.com/scummvm/scummvm/commit/19955e5d1943309c9ac2d696d9ee22eb4dee4eb9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:25:28-07:00

Commit Message:
FULLPIPE: Fix stupid c/p error. CID 1063216

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 343d5e9..4b5e4c1 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1553,7 +1553,7 @@ bool Movement::gotoPrevFrame() {
 
 		_currDynamicPhaseIndex--;
 		if (_currDynamicPhaseIndex < 0)
-			_currDynamicPhaseIndex = _currMovement->_dynamicPhases.size() - 1;
+			_currDynamicPhaseIndex = _dynamicPhases.size() - 1;
 	}
 
 	updateCurrDynamicPhase();


Commit: 2fb823c19bdd62e24d2e86ee2b77f6e4a84e3d66
    https://github.com/scummvm/scummvm/commit/2fb823c19bdd62e24d2e86ee2b77f6e4a84e3d66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:28:44-07:00

Commit Message:
FULLPIPE: Fix unneeded check. CID 1063206

Changed paths:
    engines/fullpipe/scenes.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index d66291d..7bc8f68 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -137,17 +137,13 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 	_aniMan->_statics = _aniMan->getStaticsById(ST_MAN_EMPTY);
 	_aniMan->setOXY(0, 0);
 
-	if (_aniMan) {
-		_aniMan2 = _aniMan;
-		MctlCompound *cmp = getSc2MctlCompoundBySceneId(entrance->_sceneId);
-		cmp->initMovGraph2();
-		cmp->addObject(_aniMan);
-		cmp->setEnabled();
-		getGameLoaderInteractionController()->enableFlag24();
-		setInputDisabled(0);
-	} else {
-		_aniMan2 = 0;
-	}
+	_aniMan2 = _aniMan;
+	MctlCompound *cmp = getSc2MctlCompoundBySceneId(entrance->_sceneId);
+	cmp->initMovGraph2();
+	cmp->addObject(_aniMan);
+	cmp->setEnabled();
+	getGameLoaderInteractionController()->enableFlag24();
+	setInputDisabled(0);
 
 	scene->setPictureObjectsFlag4();
 


Commit: 0b88ffab1bd5d4d3bf45d32c5c3833eafaa82e13
    https://github.com/scummvm/scummvm/commit/0b88ffab1bd5d4d3bf45d32c5c3833eafaa82e13
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:31:47-07:00

Commit Message:
FULLPIPE: Fix uninitialized class variables

Changed paths:
    engines/fullpipe/statics.cpp



diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index 4b5e4c1..e33eb11 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1131,6 +1131,9 @@ Movement::Movement(Movement *src, StaticANIObject *ani) {
 	_currDynamicPhaseIndex = src->_currDynamicPhaseIndex;
 	_field_94 = 0;
 
+	_field_24 = 0;
+	_field_28 = 0;
+
 	_currMovement = src;
 	_ox = src->_ox;
 	_oy = src->_oy;


Commit: 4d52f7b70129247396bc19a0ca7d37e2d8381031
    https://github.com/scummvm/scummvm/commit/4d52f7b70129247396bc19a0ca7d37e2d8381031
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:33:50-07:00

Commit Message:
FULLPIPE: Remove unused class variable. CID 1063191

Changed paths:
    engines/fullpipe/scene.h



diff --git a/engines/fullpipe/scene.h b/engines/fullpipe/scene.h
index 7fe3b93..db0da5d 100644
--- a/engines/fullpipe/scene.h
+++ b/engines/fullpipe/scene.h
@@ -88,7 +88,6 @@ class SceneTag : public CObject {
 	char *_tag;
 	Scene *_scene;
 	int16 _sceneId;
-	int16 _field_12;
 
  public:
 	SceneTag();


Commit: 3329dc8fe04aeb9b2bab2cd68d5a00a31c0ce2a4
    https://github.com/scummvm/scummvm/commit/3329dc8fe04aeb9b2bab2cd68d5a00a31c0ce2a4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:38:07-07:00

Commit Message:
FULLPIPE: Initialized class variables. CID 1063198

Changed paths:
    engines/fullpipe/messages.cpp
    engines/fullpipe/messages.h



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index e74aae0..a7aa0ff 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -196,6 +196,9 @@ MessageQueue::MessageQueue() {
 	_isFinished = 0;
 	_flags = 0;
 	_queueName = 0;
+	_counter = 0;
+	_field_38 = 0;
+	_flag1 = 0;
 }
 
 MessageQueue::MessageQueue(MessageQueue *src, int parId, int field_38) {
diff --git a/engines/fullpipe/messages.h b/engines/fullpipe/messages.h
index 5ae94b9..6b72364 100644
--- a/engines/fullpipe/messages.h
+++ b/engines/fullpipe/messages.h
@@ -99,7 +99,6 @@ class MessageQueue : public CObject {
 	int _flags;
 	char *_queueName;
 	int16 _dataId;
-	int16 _field_12;
 	CObject *_field_14;
 	Common::List<ExCommand *> _exCommands;
 	int _counter;


Commit: 6e7f4d3669437e616676cc332c06c79cb0ce4c97
    https://github.com/scummvm/scummvm/commit/6e7f4d3669437e616676cc332c06c79cb0ce4c97
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:40:34-07:00

Commit Message:
FULLPIPE: Initialize class variable

Changed paths:
    engines/fullpipe/messages.cpp



diff --git a/engines/fullpipe/messages.cpp b/engines/fullpipe/messages.cpp
index a7aa0ff..b5f2cb8 100644
--- a/engines/fullpipe/messages.cpp
+++ b/engines/fullpipe/messages.cpp
@@ -225,6 +225,7 @@ MessageQueue::MessageQueue(MessageQueue *src, int parId, int field_38) {
 	g_fullpipe->_globalMessageQueueList->addMessageQueue(this);
 
 	_isFinished = 0;
+	_flag1 = 0;
 }
 
 MessageQueue::~MessageQueue() {


Commit: 2b2157cf620da980bb8bad0adcf43fef4b4d40a8
    https://github.com/scummvm/scummvm/commit/2b2157cf620da980bb8bad0adcf43fef4b4d40a8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-22T01:42:50-07:00

Commit Message:
FULLPIPE: Initialize class variable in constructor. CID 1090697

Changed paths:
    engines/fullpipe/motion.h



diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index e692c01..d666bc5 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -30,12 +30,12 @@ int doSomeAnimation(int objId, int objKey, int a3);
 int doSomeAnimation2(int objId, int objKey);
 
 class MotionController : public CObject {
- public:
+public:
 	int _field_4;
 	bool _isEnabled;
 
- public:
-	MotionController() : _isEnabled(true) {}
+public:
+	MotionController() : _isEnabled(true), _field_4(0) {}
 	virtual bool load(MfcArchive &file);
 
 	void setEnabled() { _isEnabled = true; }






More information about the Scummvm-git-logs mailing list