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

[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:
43b5a0ebf9 FULLPIPE: Implement  scene04_speakerCallback()
ba52b4aca7 FULLPIPE: Some renames in scene04


Commit: 43b5a0ebf90058b214fdbf02e2441b9da55047e3
    https://github.com/scummvm/scummvm/commit/43b5a0ebf90058b214fdbf02e2441b9da55047e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-29T00:01:36-08:00

Commit Message:
FULLPIPE: Implement  scene04_speakerCallback()

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



diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index 28a9b6f..f36dc48 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -36,8 +36,27 @@
 
 namespace Fullpipe {
 
-void scene04_callback(int *param) {
-	warning("STUB: scene04_callback");
+static const int scene04_speakerPhases[] = {
+	0, 1,  2,  3, -1, -1,
+	0, 2,  3, -1, -1, -1,
+	0, 2, -1, -1, -1, -1
+};
+
+void scene04_speakerCallback(int *phase) {
+	if (g_vars->scene04_soundPlaying) {
+		if (g_vars->scene04_var17 >= 0) {
+			*phase = scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16];
+
+			g_vars->scene04_var17++;
+
+			if (scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16] < 0) {
+				g_vars->scene04_var17 = 0;
+				g_vars->scene04_var16 = g_fullpipe->_rnd->getRandomNumber(2);
+			}
+		} else {
+			++g_vars->scene04_var17;
+		}
+	}
 }
 
 void scene04_initScene(Scene *sc) {
@@ -166,7 +185,7 @@ void scene04_initScene(Scene *sc) {
 		g_vars->scene04_mamasha->hide();
 
 	g_vars->scene04_speaker = sc->getStaticANIObject1ById(ANI_SPEAKER_4, -1);
-	g_vars->scene04_speaker->_callback2 = scene04_callback;
+	g_vars->scene04_speaker->_callback2 = scene04_speakerCallback;
 	g_vars->scene04_speaker->startAnim(MV_SPK4_PLAY, 0, -1);
 
 	g_vars->scene04_var16 = 0;


Commit: ba52b4aca701bdf7bead7a50baccee9868a3406c
    https://github.com/scummvm/scummvm/commit/ba52b4aca701bdf7bead7a50baccee9868a3406c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-11-29T00:06:07-08:00

Commit Message:
FULLPIPE: Some renames 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 7cf469d..5b55d40 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -90,8 +90,8 @@ Vars::Vars() {
 	scene04_var13 = 0;
 	scene04_var14 = 0;
 	scene04_var15 = 0;
-	scene04_var16 = 0;
-	scene04_var17 = 0;
+	scene04_speakerVariant = 0;
+	scene04_speakerPhase = 0;
 	scene04_var18 = 0;
 	scene04_var19 = 0;
 	scene04_var20 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index c890dd8..217cfd9 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -116,8 +116,8 @@ public:
 	int scene04_var13;
 	int scene04_var14;
 	int scene04_var15;
-	int scene04_var16;
-	int scene04_var17;
+	int scene04_speakerVariant;
+	int scene04_speakerPhase;
 	int scene04_var18;
 	int scene04_var19;
 	int scene04_var20;
diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp
index f36dc48..30b5f0a 100644
--- a/engines/fullpipe/scenes/scene04.cpp
+++ b/engines/fullpipe/scenes/scene04.cpp
@@ -44,17 +44,17 @@ static const int scene04_speakerPhases[] = {
 
 void scene04_speakerCallback(int *phase) {
 	if (g_vars->scene04_soundPlaying) {
-		if (g_vars->scene04_var17 >= 0) {
-			*phase = scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16];
+		if (g_vars->scene04_speakerPhase >= 0) {
+			*phase = scene04_speakerPhases[g_vars->scene04_speakerPhase + 6 * g_vars->scene04_speakerVariant];
 
-			g_vars->scene04_var17++;
+			g_vars->scene04_speakerPhase++;
 
-			if (scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16] < 0) {
-				g_vars->scene04_var17 = 0;
-				g_vars->scene04_var16 = g_fullpipe->_rnd->getRandomNumber(2);
+			if (scene04_speakerPhases[g_vars->scene04_speakerPhase + 6 * g_vars->scene04_speakerVariant] < 0) {
+				g_vars->scene04_speakerPhase = 0;
+				g_vars->scene04_speakerVariant = g_fullpipe->_rnd->getRandomNumber(2);
 			}
 		} else {
-			++g_vars->scene04_var17;
+			++g_vars->scene04_speakerPhase;
 		}
 	}
 }
@@ -188,8 +188,8 @@ void scene04_initScene(Scene *sc) {
 	g_vars->scene04_speaker->_callback2 = scene04_speakerCallback;
 	g_vars->scene04_speaker->startAnim(MV_SPK4_PLAY, 0, -1);
 
-	g_vars->scene04_var16 = 0;
-	g_vars->scene04_var17 = 0;
+	g_vars->scene04_speakerVariant = 0;
+	g_vars->scene04_speakerPhase = 0;
 
 	g_fullpipe->initArcadeKeys("SC_4");
 }