[Scummvm-cvs-logs] scummvm master -> 71fa9fe2184d9e1677661b1481f1fbb561d4e0c0

[sev-]

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

Summary:
c8c9011371 FULLPIPE: Implement sceneHandler04_sub3()
71fa9fe218 FULLPIPE: Give some names in scene04


Commit: c8c901137165a063a9dbc533c9c35592abb1eff6
    https://github.com/scummvm/scummvm/commit/c8c901137165a063a9dbc533c9c35592abb1eff6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-27T20:42:15-08:00

Commit Message:
FULLPIPE: Implement sceneHandler04_sub3()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene04.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 2e15423..9159368 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -191,6 +191,7 @@ namespace Fullpipe {
 #define QU_INTR_FINISH 5138
 #define QU_INTR_GETUPMAN 5136
 #define QU_INTR_STARTINTRO 5133
+#define QU_KOZAW_WALK 505
 #define QU_PNK_CLICK 550
 #define QU_SC3_ENTERLIFT 2779
 #define QU_SC3_EXITLIFT 2808
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 277beb0..0ff34d5 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -89,7 +89,7 @@ public:
 	Common::Point scene04_jumpingKozyawki[20];
 	Common::Point scene04_jumpRotateKozyawki[20];
 
-	Common::Array<StaticANIObject *> scene04_kozyawkiObjList;
+	Common::List<StaticANIObject *> scene04_kozyawkiObjList;
 	Common::Array<GameObject *> scene04_bottleObjList;
 	Common::Array<StaticANIObject *> scene04_kozyawkiAni;
 
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index dab2131..db5e327 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -328,7 +328,14 @@ void sceneHandler04_sub1(ExCommand *ex) {
 }
 
 void sceneHandler04_sub3() {
-	warning("sceneHandler04_sub3()");
+	if (g_vars->scene04_kozyawkiObjList.size()) {
+		g_vars->scene04_var05 = g_vars->scene04_kozyawkiObjList.front();
+		g_vars->scene04_kozyawkiObjList.pop_front();
+
+		MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_KOZAW_WALK), 0, 1);
+		mq->replaceKeyCode(-1, g_vars->scene04_var05->_okeyCode);
+		mq->chain(0);
+	}
 }
 
 void sceneHandler04_sub4() {


Commit: 71fa9fe2184d9e1677661b1481f1fbb561d4e0c0
    https://github.com/scummvm/scummvm/commit/71fa9fe2184d9e1677661b1481f1fbb561d4e0c0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-27T20:42:15-08:00

Commit Message:
FULLPIPE: Give some names in scene04

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene04.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 6771fe8..7cf469d 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -79,7 +79,7 @@ Vars::Vars() {
 	scene04_var01 = 0;
 	scene04_var02 = 0;
 	scene04_var04 = 0;
-	scene04_var05 = 0;
+	scene04_walkingKozyawka = 0;
 	scene04_var06 = 0;
 	scene04_var07 = 0;
 	scene04_var08 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0ff34d5..c890dd8 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -105,7 +105,7 @@ public:
 	int scene04_var01;
 	int scene04_var02;
 	int scene04_var04;
-	StaticANIObject *scene04_var05;
+	StaticANIObject *scene04_walkingKozyawka;
 	int scene04_var06;
 	int scene04_var07;
 	int scene04_var08;
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index db5e327..28a9b6f 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -143,7 +143,7 @@ void scene04_initScene(Scene *sc) {
 	g_vars->scene04_var02 = 0;
 	g_vars->scene04_soundPlaying = 0;
 	g_vars->scene04_var04 = 0;
-	g_vars->scene04_var05 = 0;
+	g_vars->scene04_walkingKozyawka = 0;
 	g_vars->scene04_var06 = 2;
 	g_vars->scene04_dynamicPhaseIndex = 0;
 
@@ -327,13 +327,13 @@ void sceneHandler04_sub1(ExCommand *ex) {
 	g_fullpipe->_behaviorManager->setFlagByStaticAniObject(g_fullpipe->_aniMan, 1);
 }
 
-void sceneHandler04_sub3() {
+void sceneHandler04_walkKozyawka() {
 	if (g_vars->scene04_kozyawkiObjList.size()) {
-		g_vars->scene04_var05 = g_vars->scene04_kozyawkiObjList.front();
+		g_vars->scene04_walkingKozyawka = g_vars->scene04_kozyawkiObjList.front();
 		g_vars->scene04_kozyawkiObjList.pop_front();
 
 		MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_KOZAW_WALK), 0, 1);
-		mq->replaceKeyCode(-1, g_vars->scene04_var05->_okeyCode);
+		mq->replaceKeyCode(-1, g_vars->scene04_walkingKozyawka->_okeyCode);
 		mq->chain(0);
 	}
 }
@@ -457,13 +457,14 @@ int sceneHandler04(ExCommand *ex) {
 		break;
 
 	case MSG_KOZAWRESTART:
-		if (g_vars->scene04_var05) {
-			g_vars->scene04_kozyawkiObjList.push_back(g_vars->scene04_var05);
-			g_vars->scene04_var05->hide();
-			g_vars->scene04_var05 = 0;
+		if (g_vars->scene04_walkingKozyawka) {
+			g_vars->scene04_kozyawkiObjList.push_back(g_vars->scene04_walkingKozyawka);
+			g_vars->scene04_walkingKozyawka->hide();
+			g_vars->scene04_walkingKozyawka = 0;
 		}
+
 		if (g_vars->scene04_soundPlaying)
-			sceneHandler04_sub3();
+			sceneHandler04_walkKozyawka();
 
 		break;