[Scummvm-cvs-logs] scummvm master -> e26462696d6ca8b05b790b615c649ee444c7b565

[sev-]

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

Summary:
2b1d7f1eb7 FULLPIPE: Initialize variable
48fef827a5 FULLPIPE: Remove redundant check. CID 1148380
a215472f97 FULLPIPE: Initialize variable
352b8a67f0 FULLPIPE: Initialize variables
8a9366527f FULLPIPE: Remove redundant check
e26462696d FULLPIPE: Add sanity check


Commit: 2b1d7f1eb75722819cbc7e65f33644436c4b1ed7
    https://github.com/scummvm/scummvm/commit/2b1d7f1eb75722819cbc7e65f33644436c4b1ed7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Initialize variable

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index a0348a9..674dada 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -94,6 +94,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 	_isProcessingMessages = false;
 
 	_musicAllowed = -1;
+	_musicGameVar = 0;
 
 	_aniMan = 0;
 	_aniMan2 = 0;


Commit: 48fef827a5093495e97d58b6e7842d882587960c
    https://github.com/scummvm/scummvm/commit/48fef827a5093495e97d58b6e7842d882587960c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Remove redundant check. CID 1148380

Changed paths:
    engines/fullpipe/scenes/scene16.cpp



diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index a280273..79d1179 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -191,7 +191,7 @@ void sceneHandler16_fillMug() {
 			mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
 
 			mq->replaceKeyCode(-1, g_vars->scene16_walkingGirl->_okeyCode);
-			if (mq->chain(g_vars->scene16_walkingGirl) || !mq)
+			if (mq->chain(g_vars->scene16_walkingGirl))
 				return;
 		}
 		delete mq;


Commit: a215472f97f3f5d6a23cb0968892ead1f4d9bc27
    https://github.com/scummvm/scummvm/commit/a215472f97f3f5d6a23cb0968892ead1f4d9bc27
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Initialize variable

Changed paths:
    engines/fullpipe/scenes/scene16.cpp



diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 79d1179..b1e2612 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -121,7 +121,7 @@ int scene16_updateCursor() {
 }
 
 void sceneHandler16_laughSound() {
-	int snd;
+	int snd = SND_16_035;
 
 	switch (g_vars->scene16_sound) {
 	case SND_16_034:


Commit: 352b8a67f02bce2f3bc56aece21bffc52eb0508d
    https://github.com/scummvm/scummvm/commit/352b8a67f02bce2f3bc56aece21bffc52eb0508d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Initialize variables

Changed paths:
    engines/fullpipe/scenes/scene25.cpp



diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
index 5c2ddc6..574e3dd 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/fullpipe/scenes/scene25.cpp
@@ -436,7 +436,7 @@ void sceneHandler25_backToPipe() {
 
 void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, MessageQueue *mq, int flag) {
 	int aniY = ani->_oy;
-	int newx, newy;
+	int newx = 0, newy = 0;
 	Common::Point point;
 	ExCommand *ex;
 
@@ -488,7 +488,7 @@ void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, Messa
 	for (int i = 0; i < numObsolete; i++)
 		mq->deleteExCommandByIndex(0, 1);
 
-    ex = new ExCommand(ani->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
+	ex = new ExCommand(ani->_id, 34, 256, 0, 0, 0, 1, 0, 0, 0);
 
 	ex->_field_14 = 256;
 	ex->_messageNum = 0;
@@ -588,7 +588,7 @@ int sceneHandler25(ExCommand *cmd) {
 		break;
 
 	case 33:
-        if (g_fp->_aniMan2) {
+		if (g_fp->_aniMan2) {
 			int x = g_fp->_aniMan2->_ox;
 			int y = g_fp->_aniMan2->_oy;
 


Commit: 8a9366527f26cdd853779b4f84d2c951a995be9f
    https://github.com/scummvm/scummvm/commit/8a9366527f26cdd853779b4f84d2c951a995be9f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Remove redundant check

Changed paths:
    engines/fullpipe/scenes/scene22.cpp



diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp
index 657fe12..13c9ab3 100644
--- a/engines/fullpipe/scenes/scene22.cpp
+++ b/engines/fullpipe/scenes/scene22.cpp
@@ -261,8 +261,7 @@ void sceneHandler22_stoolLogic(ExCommand *cmd) {
 
 				mq->deleteExCommandByIndex(0, 0);
 
-				if (mq)
-					delete mq;
+				delete mq;
 
 				mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC22_TOSTOOL_R), 0, 0);
 


Commit: e26462696d6ca8b05b790b615c649ee444c7b565
    https://github.com/scummvm/scummvm/commit/e26462696d6ca8b05b790b615c649ee444c7b565
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-06T13:24:36-08:00

Commit Message:
FULLPIPE: Add sanity check

Changed paths:
    engines/fullpipe/scenes/scene25.cpp



diff --git a/engines/fullpipe/scenes/scene25.cpp b/engines/fullpipe/scenes/scene25.cpp
index 574e3dd..ba07c3e 100644
--- a/engines/fullpipe/scenes/scene25.cpp
+++ b/engines/fullpipe/scenes/scene25.cpp
@@ -509,6 +509,9 @@ void sceneHandler25_walkOnLadder(StaticANIObject *ani, Common::Point *pnt, Messa
 
 		ani->_movement->setDynamicPhaseIndex(idx);
 	} else {
+		if (!lastEx)
+			error("sceneHandler25_walkOnLadder(): Incorrect state. Please report this to sev");
+
 		ani->changeStatics2(ani->getMovementById(lastEx->_messageNum)->_staticsObj1->_staticsId);
 		ani->setOXY(newx, newy);
 		ani->restartMessageQueue(mq);