[Scummvm-cvs-logs] scummvm master -> 415c370655b75debde9954698a2dbd1d3a8b0a8e

sev- sev at scummvm.org
Thu Jan 2 18:04:31 CET 2014


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

Summary:
415c370655 FULLPIPE: Initial code for scene22


Commit: 415c370655b75debde9954698a2dbd1d3a8b0a8e
    https://github.com/scummvm/scummvm/commit/415c370655b75debde9954698a2dbd1d3a8b0a8e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-02T08:56:32-08:00

Commit Message:
FULLPIPE: Initial code for scene22

Changed paths:
  A engines/fullpipe/scenes/scene22.cpp
    engines/fullpipe/objectnames.h



diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 928fcad..06888b6 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -228,6 +228,7 @@ namespace Fullpipe {
 #define sO_Janitors "\xd3\xe1\xee\xf0\xf9\xe8\xea\xe8"	// "Уборщики"
 #define sO_Janitress "\xd3\xe1\xee\xf0\xf9\xe8\xf6\xe0"	// "Уборщица"
 #define sO_IsGone "\xd3\xe5\xf5\xe0\xeb\xe0"	// "Уехала"
+#define sO_FallenTwice "\xd3\xef\xe0\xeb \xe4\xe2\xe0"	// "Упал два"
 #define sO_FallenOnce "\xd3\xef\xe0\xeb \xf0\xe0\xe7"	// "Упал раз"
 #define sO_FallenBrush "\xd3\xef\xe0\xeb\xe0 \xf9\xe5\xf2\xea\xe0"	// "Упала щетка"
 #define sO_NotBroken "\xd6\xe5\xeb\xe0"	// "Цела"
diff --git a/engines/fullpipe/scenes/scene22.cpp b/engines/fullpipe/scenes/scene22.cpp
new file mode 100644
index 0000000..970f5b3
--- /dev/null
+++ b/engines/fullpipe/scenes/scene22.cpp
@@ -0,0 +1,77 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "fullpipe/fullpipe.h"
+
+#include "fullpipe/objectnames.h"
+#include "fullpipe/constants.h"
+
+#include "fullpipe/gameloader.h"
+#include "fullpipe/motion.h"
+#include "fullpipe/scenes.h"
+#include "fullpipe/statics.h"
+
+#include "fullpipe/interaction.h"
+#include "fullpipe/behavior.h"
+
+
+namespace Fullpipe {
+
+void scene22_initScene(Scene *sc) {
+	g_vars->scene22_var01 = 200;
+	g_vars->scene22_var02 = 200;
+	g_vars->scene22_var03 = 300;
+	g_vars->scene22_var04 = 300;
+	g_vars->scene22_var05 = Scene_getStaticANIObject1ById(sc, ANI_MESHOK, -1);
+
+	Scene *oldsc = g_fp->_currentScene;
+	g_fp->_currentScene = sc;
+
+	g_vars->scene22_giraffeMiddle = sc->getStaticANIObject1ById(sc, ANI_GIRAFFE_MIDDLE, -1);
+	g_vars->scene22_var07 = 0;
+	g_vars->scene22_var08 = 0;
+	g_vars->scene22_var09 = 0;
+	g_vars->scene22_var10 = 1;
+
+	if (g_fp->getObjectState(sO_Bag_22) == g_fp->getObjectEnumState(sO_Bag_22, sO_NotFallen))
+		g_vars->scene22_var11 = 0;
+	else if (g_fp->getObjectState(sO_Bag_22) == g_fp->getObjectEnumState(sO_Bag_22, sO_FallenOnce))
+		g_vars->scene22_var11 = 1;
+	else if ( g_fp->getObjectState(sO_Bag_22) == g_fp->getObjectEnumState(sO_Bag_22, sO_FallenTwice))
+		g_vars->scene22_var11 = 2;
+	else {
+		g_vars->scene22_var11 = 3;
+        g_vars->scene22_var10 = 0;
+	}
+
+
+	if ( g_fp->getObjectState(sO_LowerPipe_21) == g_fp->getObjectEnumState(sO_LowerPipe_21, sO_IsOpened))
+		g_vars->scene22_giraffeMiddle->changeStatics2(ST_GRFM_AFTER);
+	else
+		g_vars->scene22_giraffeMiddle->changeStatics2(ST_GRFM_NORM);
+
+	g_fp->_currentScene = oldsc;
+
+	g_fp->initArcadeKeys("SC_22");
+}
+
+} // End of namespace Fullpipe






More information about the Scummvm-git-logs mailing list