GNAP: Group cutscenes in a single scene group file

11 files changed, 470 insertions, 658 deletions

diff --git a/engines/gnap/module.mk b/engines/gnap/module.mk
index a2e5c77c82..bb565eb276 100644
--- a/engines/gnap/module.mk
+++ b/engines/gnap/module.mk
@@ -10,6 +10,7 @@ MODULE_OBJS := \
 	menu.o \
 	resource.o \
 	sound.o \
+	scenes/groupcs.o \
 	scenes/scene00.o \
 	scenes/scene01.o \
 	scenes/scene02.o \
@@ -26,7 +27,6 @@ MODULE_OBJS := \
 	scenes/scene13.o \
 	scenes/scene14.o \
 	scenes/scene15.o \
-	scenes/scene16.o \
 	scenes/scene17.o \
 	scenes/scene18.o \
 	scenes/scene19.o \
@@ -53,14 +53,11 @@ MODULE_OBJS := \
 	scenes/scene44.o \
 	scenes/scene45.o \
 	scenes/scene46.o \
-	scenes/scene47.o \
-	scenes/scene48.o \
 	scenes/scene49.o \
 	scenes/scene50.o \
 	scenes/scene51.o \
 	scenes/scene52.o \
 	scenes/scene53.o \
-	scenes/scene54.o \
 	scenes/scenecore.o
 
 # This module can be built as a plugin
diff --git a/engines/gnap/scenes/groupcs.cpp b/engines/gnap/scenes/groupcs.cpp
new file mode 100644
index 0000000000..92491a3847
--- /dev/null
+++ b/engines/gnap/scenes/groupcs.cpp
@@ -0,0 +1,430 @@
+/* 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 "gnap/gnap.h"
+#include "gnap/gamesys.h"
+#include "gnap/resource.h"
+#include "gnap/scenes/groupcs.h"
+
+
+namespace Gnap {
+
+Scene16::Scene16(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene16::init() {
+	_sequenceIdArr[0] = 0x1F2;
+	_sequenceIdArr[1] = 0x201;
+	_sequenceIdArr[2] = 0x1FC;
+	_sequenceIdArr[3] = 0x1F4;
+	_sequenceIdArr[4] = 0x1FB;
+	_sequenceIdArr[5] = 0x1F0;
+	_sequenceIdArr[6] = 0x1FD;
+	_sequenceIdArr[7] = 0x1FE;
+	_sequenceIdArr[8] = 0x1F7;
+	_sequenceIdArr[9] = 0x1F9;
+	_sequenceIdArr[10] = 0x1F8;
+	_sequenceIdArr[11] = 0x1F1;
+	_sequenceIdArr[12] = 0x202;
+	_sequenceIdArr[13] = 0x1F6;
+	_sequenceIdArr[14] = 0x1F3;
+	_sequenceIdArr[15] = 0x1FA;
+	_sequenceIdArr[16] = 0x1FF;
+	_sequenceIdArr[17] = 0x200;
+	_sequenceIdArr[18] = 0x203;
+	_sequenceIdArr[19] = 0x206;
+	_sequenceIdArr[20] = 0x207;
+	_sequenceIdArr[21] = 0x204;
+	_sequenceIdArr[22] = 0x205;
+	_resourceIdArr[0] = 0x1C;
+	_resourceIdArr[1] = 2;
+	_resourceIdArr[2] = 0x1B;
+	_resourceIdArr[3] = 0;
+	_resourceIdArr[4] = 0x167;
+	_resourceIdArr[5] = 1;
+	_resourceIdArr[6] = 0x15B;
+	_resourceIdArr[7] = 0x15A;
+	_resourceIdArr[8] = 0x170;
+	_resourceIdArr[9] = 0x1EB;
+	_resourceIdArr[10] = 0x1EC;
+	_resourceIdArr[11] = 0x1BE;
+	_resourceIdArr[12] = 0x1BF;
+	_sequenceCountArr[0] = 4;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_sequenceCountArr[3] = 6;
+	_sequenceCountArr[4] = 1;
+	_sequenceCountArr[5] = 3;
+	_sequenceCountArr[6] = 1;
+	_sequenceCountArr[7] = 1;
+	_sequenceCountArr[8] = 1;
+	_sequenceCountArr[9] = 1;
+	_sequenceCountArr[10] = 1;
+	_sequenceCountArr[11] = 1;
+	_sequenceCountArr[12] = 1;
+	_itemsCount = 13;
+
+	return -1;
+}
+
+/*****************************************************************************/
+
+Scene471::Scene471(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene471::init() {
+	_sequenceIdArr[0] = 0x301;
+	_sequenceIdArr[1] = 0x305;
+	_sequenceIdArr[2] = 0x302;
+	_sequenceIdArr[3] = 0x304;
+	_sequenceIdArr[4] = 0x300;
+	_resourceIdArr[0] = 3;
+	_resourceIdArr[1] = 0;
+	_resourceIdArr[2] = 1;
+	_resourceIdArr[3] = 0;
+	_resourceIdArr[4] = 2;
+	_sequenceCountArr[0] = 1;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_sequenceCountArr[3] = 1;
+	_sequenceCountArr[4] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_canSkip[4] = false;
+	_itemsCount = 5;
+
+	return -1;
+}
+
+Scene472::Scene472(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene472::init() {
+	_sequenceIdArr[0] = 0x306;
+	_sequenceIdArr[1] = 0x309;
+	_sequenceIdArr[2] = 0x307;
+	_sequenceIdArr[3] = 0x308;
+	_sequenceIdArr[4] = 0x30A;
+	_resourceIdArr[0] = 0x8E;
+	_resourceIdArr[1] = 0x90;
+	_resourceIdArr[2] = 0x8F;
+	_resourceIdArr[3] = 0x91;
+	_sequenceCountArr[0] = 2;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_sequenceCountArr[3] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_itemsCount = 4;
+
+	return -1;
+}
+
+Scene473::Scene473(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene473::init() {
+	_sequenceIdArr[0] = 0x320;
+	_sequenceIdArr[1] = 0x321;
+	_resourceIdArr[0] = 0x142;
+	_resourceIdArr[1] = 0x143;
+	_sequenceCountArr[0] = 1;
+	_sequenceCountArr[1] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_itemsCount = 2;
+
+	return -1;
+}
+
+Scene474::Scene474(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene474::init() {
+	_sequenceIdArr[0] = 0x30C;
+	_sequenceIdArr[1] = 0x30D;
+	_sequenceIdArr[2] = 0x30B;
+	_resourceIdArr[0] = 0x142;
+	_resourceIdArr[1] = 0x141;
+	_resourceIdArr[2] = 0x177;
+	_sequenceCountArr[0] = 1;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_itemsCount = 3;
+
+	return -1;
+}
+
+Scene475::Scene475(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene475::init() {
+	_sequenceIdArr[0] = 0x30E;
+	_sequenceIdArr[1] = 0x30F;
+	_sequenceIdArr[2] = 0x310;
+	_sequenceIdArr[3] = 0x311;
+	_resourceIdArr[0] = 0x206;
+	_resourceIdArr[1] = 0x207;
+	_sequenceCountArr[0] = 3;
+	_sequenceCountArr[1] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_itemsCount = 2;
+
+	return -1;
+}
+
+Scene476::Scene476(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene476::init() {
+	_sequenceIdArr[0] = 0x31E;
+	_sequenceIdArr[1] = 0x31F;
+	_resourceIdArr[0] = 0x2FA;
+	_sequenceCountArr[0] = 2;
+	_canSkip[0] = false;
+	_itemsCount = 1;
+
+	return -1;
+}
+
+Scene477::Scene477(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene477::init() {
+	int v0, v4, v2, v3;
+	
+	_sequenceIdArr[0] = 0x316;
+	_sequenceIdArr[1] = 0x31A;
+	_sequenceIdArr[2] = 0x314;
+	_sequenceIdArr[3] = 0x31B;
+	int v1 = 4;
+	if (!_vm->isFlag(kGFTwigTaken)) {
+		_sequenceIdArr[4] = 0x31C;
+		v1 = 5;
+	}
+	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant))
+		_sequenceIdArr[v1++] = 0x31D;
+	v4 = v1;
+	_sequenceIdArr[v1] = 0x319;
+	v0 = v1 + 1;
+	v3 = v0;
+	_sequenceIdArr[v0++] = 0x317;
+	_sequenceIdArr[v0++] = 0x312;
+	_sequenceIdArr[v0] = 0x31A;
+	v2 = v0 + 1;
+	if (!_vm->isFlag(kGFTwigTaken))
+		_sequenceIdArr[v2++] = 0x31C;
+	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant))
+		_sequenceIdArr[v2++] = 0x31D;
+	_sequenceIdArr[v2] = 0x313;
+	_sequenceIdArr[v2 + 1] = 0x315;
+	_resourceIdArr[0] = 0x2B8;
+	_resourceIdArr[1] = 0x20C;
+	_resourceIdArr[2] = 0x2B8;
+	_resourceIdArr[3] = 0x20B;
+	_resourceIdArr[4] = 0x20B;
+	_sequenceCountArr[0] = v4;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = v2 - v3;
+	_sequenceCountArr[3] = 1;
+	_sequenceCountArr[4] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_canSkip[4] = false;
+	_itemsCount = 5;
+
+	return -1;
+}
+
+/*****************************************************************************/
+
+Scene48::Scene48(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene48::init() {
+	_sequenceIdArr[0] = 390;
+	_sequenceIdArr[1] = 391;
+	_sequenceIdArr[2] = 392;
+	_sequenceIdArr[3] = 393;
+	_sequenceIdArr[4] = 394;
+	_sequenceIdArr[5] = 395;
+	_sequenceIdArr[6] = 396;
+	_sequenceIdArr[7] = 397;
+	_sequenceIdArr[8] = 398;
+	_sequenceIdArr[9] = 399;
+	_sequenceIdArr[10] = 400;
+	_sequenceIdArr[11] = 401;
+	_sequenceIdArr[12] = 402;
+	_resourceIdArr[0] = 238;
+	_resourceIdArr[1] = 42;
+	_resourceIdArr[2] = 2;
+	_resourceIdArr[3] = 37;
+	_resourceIdArr[4] = 35;
+	_resourceIdArr[5] = 38;
+	_resourceIdArr[6] = 39;
+	_resourceIdArr[7] = 40;
+	_resourceIdArr[8] = 41;
+	_resourceIdArr[9] = 36;
+	_resourceIdArr[10] = 41;
+	_resourceIdArr[11] = 388;
+	_resourceIdArr[12] = 387;
+	_sequenceCountArr[0] = 1;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_sequenceCountArr[3] = 1;
+	_sequenceCountArr[4] = 1;
+	_sequenceCountArr[5] = 1;
+	_sequenceCountArr[6] = 1;
+	_sequenceCountArr[7] = 1;
+	_sequenceCountArr[8] = 1;
+	_sequenceCountArr[9] = 1;
+	_sequenceCountArr[10] = 1;
+	_sequenceCountArr[11] = 1;
+	_sequenceCountArr[12] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_canSkip[4] = false;
+	_canSkip[5] = false;
+	_canSkip[6] = false;
+	_canSkip[7] = false;
+	_canSkip[8] = false;
+	_canSkip[9] = false;
+	_canSkip[10] = false;
+	_canSkip[11] = false;
+	_canSkip[12] = false;
+	_itemsCount = 13;
+
+	return -1;
+}
+
+/*****************************************************************************/
+
+Scene541::Scene541(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene541::init() {
+	_sequenceIdArr[0] = 0x1BE;
+	_sequenceIdArr[1] = 0x1BF;
+	_sequenceIdArr[2] = 0x1BA;
+	_sequenceIdArr[3] = 0x1BB;
+	_sequenceIdArr[4] = 0x1BD;
+	_sequenceIdArr[5] = 0x1BC;
+	_resourceIdArr[0] = 0x3C;
+	_resourceIdArr[1] = 0x43;
+	_resourceIdArr[2] = 0x44;
+	if (_vm->isFlag(kGFPictureTaken))
+		_resourceIdArr[3] = 0x47;
+	else
+		_resourceIdArr[3] = 0x46;
+	_resourceIdArr[4] = 0x45;
+	_sequenceCountArr[0] = 1;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 1;
+	_sequenceCountArr[3] = 2;
+	_sequenceCountArr[4] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_canSkip[4] = false;
+	_itemsCount = 5;
+
+	return -1;
+}
+
+Scene542::Scene542(GnapEngine *vm) : CutScene(vm) {}
+
+int Scene542::init() {
+	_sequenceIdArr[0] = 0x1C9;
+	_sequenceIdArr[1] = 0x1C7;
+	_sequenceIdArr[2] = 0x1CC;
+	_sequenceIdArr[3] = 0x1C8;
+	_sequenceIdArr[4] = 0x1CB;
+	_sequenceIdArr[5] = 0x1C0;
+	_sequenceIdArr[6] = 0x1CA;
+	_sequenceIdArr[7] = 0x1CE;
+	_sequenceIdArr[8] = 0x1CD;
+	_sequenceIdArr[9] = 0x1C1;
+	_sequenceIdArr[10] = 0x1C2;
+	_sequenceIdArr[11] = 0x1C3;
+	_sequenceIdArr[12] = 0x1C4;
+	_sequenceIdArr[13] = 0x1C6;
+	_sequenceIdArr[14] = 0x1C5;
+	_sequenceIdArr[15] = 0x1D0;
+	_sequenceIdArr[16] = 0x1D0;
+	_sequenceIdArr[17] = 0x1D0;
+	_resourceIdArr[0] = 0xD5;
+	_resourceIdArr[1] = 0x14C;
+	_resourceIdArr[2] = 0xD5;
+	_resourceIdArr[3] = 0xBF;
+	_resourceIdArr[4] = 0xD6;
+	_resourceIdArr[5] = 0x154;
+	_resourceIdArr[6] = 0x155;
+	_resourceIdArr[7] = 0xB9;
+	_resourceIdArr[8] = 0xBA;
+	_resourceIdArr[9] = 0x17B;
+	_resourceIdArr[10] = 0x17A;
+	_resourceIdArr[11] = 0x17C;
+	_resourceIdArr[12] = 0x17A;
+	_resourceIdArr[13] = 0x1B7;
+	_resourceIdArr[14] = 0x1B8;
+	_resourceIdArr[15] = 0x1B9;
+	_sequenceCountArr[0] = 2;
+	_sequenceCountArr[1] = 1;
+	_sequenceCountArr[2] = 2;
+	_sequenceCountArr[3] = 1;
+	_sequenceCountArr[4] = 1;
+	_sequenceCountArr[5] = 1;
+	_sequenceCountArr[6] = 1;
+	_sequenceCountArr[7] = 1;
+	_sequenceCountArr[8] = 1;
+	_sequenceCountArr[9] = 1;
+	_sequenceCountArr[10] = 1;
+	_sequenceCountArr[11] = 1;
+	_sequenceCountArr[12] = 1;
+	_sequenceCountArr[13] = 1;
+	_sequenceCountArr[14] = 1;
+	_sequenceCountArr[15] = 1;
+	_canSkip[0] = false;
+	_canSkip[1] = false;
+	_canSkip[2] = false;
+	_canSkip[3] = false;
+	_canSkip[4] = false;
+	_canSkip[5] = false;
+	_canSkip[6] = false;
+	_canSkip[7] = false;
+	_canSkip[8] = false;
+	_canSkip[9] = false;
+	_canSkip[10] = false;
+	_canSkip[11] = false;
+	_canSkip[12] = false;
+	_canSkip[13] = true;
+	_canSkip[14] = true;
+	_canSkip[15] = false;
+	_itemsCount = 16;
+
+	return -1;
+}
+
+} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene47.h b/engines/gnap/scenes/groupcs.h
index f1c1034223..26f51abb0b 100644
--- a/engines/gnap/scenes/scene47.h
+++ b/engines/gnap/scenes/groupcs.h
@@ -20,15 +20,23 @@
  *
  */
 
-#ifndef GNAP_SCENE47_H
-#define GNAP_SCENE47_H
+#ifndef GNAP_GROUPCS_H
+#define GNAP_GROUPCS_H
 
 #include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
 
 namespace Gnap {
 
 class GnapEngine;
+class CutScene;
+
+class Scene16: public CutScene {
+public:
+	Scene16(GnapEngine *vm);
+	~Scene16() {}
+
+	virtual int init();
+};
 
 class Scene471: public CutScene {
 public:
@@ -85,5 +93,30 @@ public:
 
 	virtual int init();
 };
+
+class Scene48: public CutScene {
+public:
+	Scene48(GnapEngine *vm);
+	~Scene48() {}
+
+	virtual int init();
+};
+
+class Scene541: public CutScene {
+public:
+	Scene541(GnapEngine *vm);
+	~Scene541() {}
+
+	virtual int init();
+};
+
+class Scene542: public CutScene {
+public:
+	Scene542(GnapEngine *vm);
+	~Scene542() {}
+
+	virtual int init();
+};
 } // End of namespace Gnap
-#endif // GNAP_SCENE47_H
+
+#endif // GNAP_GROUPCS_H
diff --git a/engines/gnap/scenes/scene16.cpp b/engines/gnap/scenes/scene16.cpp
deleted file mode 100644
index 370faf40bb..0000000000
--- a/engines/gnap/scenes/scene16.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/* 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 "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene16.h"
-
-namespace Gnap {
-
-Scene16::Scene16(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene16::init() {
-	_sequenceIdArr[0] = 0x1F2;
-	_sequenceIdArr[1] = 0x201;
-	_sequenceIdArr[2] = 0x1FC;
-	_sequenceIdArr[3] = 0x1F4;
-	_sequenceIdArr[4] = 0x1FB;
-	_sequenceIdArr[5] = 0x1F0;
-	_sequenceIdArr[6] = 0x1FD;
-	_sequenceIdArr[7] = 0x1FE;
-	_sequenceIdArr[8] = 0x1F7;
-	_sequenceIdArr[9] = 0x1F9;
-	_sequenceIdArr[10] = 0x1F8;
-	_sequenceIdArr[11] = 0x1F1;
-	_sequenceIdArr[12] = 0x202;
-	_sequenceIdArr[13] = 0x1F6;
-	_sequenceIdArr[14] = 0x1F3;
-	_sequenceIdArr[15] = 0x1FA;
-	_sequenceIdArr[16] = 0x1FF;
-	_sequenceIdArr[17] = 0x200;
-	_sequenceIdArr[18] = 0x203;
-	_sequenceIdArr[19] = 0x206;
-	_sequenceIdArr[20] = 0x207;
-	_sequenceIdArr[21] = 0x204;
-	_sequenceIdArr[22] = 0x205;
-	_resourceIdArr[0] = 0x1C;
-	_resourceIdArr[1] = 2;
-	_resourceIdArr[2] = 0x1B;
-	_resourceIdArr[3] = 0;
-	_resourceIdArr[4] = 0x167;
-	_resourceIdArr[5] = 1;
-	_resourceIdArr[6] = 0x15B;
-	_resourceIdArr[7] = 0x15A;
-	_resourceIdArr[8] = 0x170;
-	_resourceIdArr[9] = 0x1EB;
-	_resourceIdArr[10] = 0x1EC;
-	_resourceIdArr[11] = 0x1BE;
-	_resourceIdArr[12] = 0x1BF;
-	_sequenceCountArr[0] = 4;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_sequenceCountArr[3] = 6;
-	_sequenceCountArr[4] = 1;
-	_sequenceCountArr[5] = 3;
-	_sequenceCountArr[6] = 1;
-	_sequenceCountArr[7] = 1;
-	_sequenceCountArr[8] = 1;
-	_sequenceCountArr[9] = 1;
-	_sequenceCountArr[10] = 1;
-	_sequenceCountArr[11] = 1;
-	_sequenceCountArr[12] = 1;
-	_itemsCount = 13;
-
-	return -1;
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene16.h b/engines/gnap/scenes/scene16.h
deleted file mode 100644
index e9d3b7f071..0000000000
--- a/engines/gnap/scenes/scene16.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 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.
- *
- */
-
-#ifndef GNAP_SCENE16_H
-#define GNAP_SCENE16_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene16: public CutScene {
-public:
-	Scene16(GnapEngine *vm);
-	~Scene16() {}
-
-	virtual int init();
-};
-
-} // End of namespace Gnap
-#endif // GNAP_SCENE16_H
diff --git a/engines/gnap/scenes/scene47.cpp b/engines/gnap/scenes/scene47.cpp
deleted file mode 100644
index 1c96139fdd..0000000000
--- a/engines/gnap/scenes/scene47.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/* 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 "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene47.h"
-
-namespace Gnap {
-
-Scene471::Scene471(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene471::init() {
-	_sequenceIdArr[0] = 0x301;
-	_sequenceIdArr[1] = 0x305;
-	_sequenceIdArr[2] = 0x302;
-	_sequenceIdArr[3] = 0x304;
-	_sequenceIdArr[4] = 0x300;
-	_resourceIdArr[0] = 3;
-	_resourceIdArr[1] = 0;
-	_resourceIdArr[2] = 1;
-	_resourceIdArr[3] = 0;
-	_resourceIdArr[4] = 2;
-	_sequenceCountArr[0] = 1;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_sequenceCountArr[3] = 1;
-	_sequenceCountArr[4] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_canSkip[4] = false;
-	_itemsCount = 5;
-
-	return -1;
-}
-
-Scene472::Scene472(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene472::init() {
-	_sequenceIdArr[0] = 0x306;
-	_sequenceIdArr[1] = 0x309;
-	_sequenceIdArr[2] = 0x307;
-	_sequenceIdArr[3] = 0x308;
-	_sequenceIdArr[4] = 0x30A;
-	_resourceIdArr[0] = 0x8E;
-	_resourceIdArr[1] = 0x90;
-	_resourceIdArr[2] = 0x8F;
-	_resourceIdArr[3] = 0x91;
-	_sequenceCountArr[0] = 2;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_sequenceCountArr[3] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_itemsCount = 4;
-
-	return -1;
-}
-
-Scene473::Scene473(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene473::init() {
-	_sequenceIdArr[0] = 0x320;
-	_sequenceIdArr[1] = 0x321;
-	_resourceIdArr[0] = 0x142;
-	_resourceIdArr[1] = 0x143;
-	_sequenceCountArr[0] = 1;
-	_sequenceCountArr[1] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_itemsCount = 2;
-
-	return -1;
-}
-
-Scene474::Scene474(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene474::init() {
-	_sequenceIdArr[0] = 0x30C;
-	_sequenceIdArr[1] = 0x30D;
-	_sequenceIdArr[2] = 0x30B;
-	_resourceIdArr[0] = 0x142;
-	_resourceIdArr[1] = 0x141;
-	_resourceIdArr[2] = 0x177;
-	_sequenceCountArr[0] = 1;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_itemsCount = 3;
-
-	return -1;
-}
-
-Scene475::Scene475(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene475::init() {
-	_sequenceIdArr[0] = 0x30E;
-	_sequenceIdArr[1] = 0x30F;
-	_sequenceIdArr[2] = 0x310;
-	_sequenceIdArr[3] = 0x311;
-	_resourceIdArr[0] = 0x206;
-	_resourceIdArr[1] = 0x207;
-	_sequenceCountArr[0] = 3;
-	_sequenceCountArr[1] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_itemsCount = 2;
-
-	return -1;
-}
-
-Scene476::Scene476(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene476::init() {
-	_sequenceIdArr[0] = 0x31E;
-	_sequenceIdArr[1] = 0x31F;
-	_resourceIdArr[0] = 0x2FA;
-	_sequenceCountArr[0] = 2;
-	_canSkip[0] = false;
-	_itemsCount = 1;
-
-	return -1;
-}
-
-Scene477::Scene477(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene477::init() {
-	int v0, v4, v2, v3;
-	
-	_sequenceIdArr[0] = 0x316;
-	_sequenceIdArr[1] = 0x31A;
-	_sequenceIdArr[2] = 0x314;
-	_sequenceIdArr[3] = 0x31B;
-	int v1 = 4;
-	if (!_vm->isFlag(kGFTwigTaken)) {
-		_sequenceIdArr[4] = 0x31C;
-		v1 = 5;
-	}
-	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant))
-		_sequenceIdArr[v1++] = 0x31D;
-	v4 = v1;
-	_sequenceIdArr[v1] = 0x319;
-	v0 = v1 + 1;
-	v3 = v0;
-	_sequenceIdArr[v0++] = 0x317;
-	_sequenceIdArr[v0++] = 0x312;
-	_sequenceIdArr[v0] = 0x31A;
-	v2 = v0 + 1;
-	if (!_vm->isFlag(kGFTwigTaken))
-		_sequenceIdArr[v2++] = 0x31C;
-	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant))
-		_sequenceIdArr[v2++] = 0x31D;
-	_sequenceIdArr[v2] = 0x313;
-	_sequenceIdArr[v2 + 1] = 0x315;
-	_resourceIdArr[0] = 0x2B8;
-	_resourceIdArr[1] = 0x20C;
-	_resourceIdArr[2] = 0x2B8;
-	_resourceIdArr[3] = 0x20B;
-	_resourceIdArr[4] = 0x20B;
-	_sequenceCountArr[0] = v4;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = v2 - v3;
-	_sequenceCountArr[3] = 1;
-	_sequenceCountArr[4] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_canSkip[4] = false;
-	_itemsCount = 5;
-
-	return -1;
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene48.cpp b/engines/gnap/scenes/scene48.cpp
deleted file mode 100644
index 27f8d829d8..0000000000
--- a/engines/gnap/scenes/scene48.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/* 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 "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene48.h"
-
-namespace Gnap {
-
-Scene48::Scene48(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene48::init() {
-	_sequenceIdArr[0] = 390;
-	_sequenceIdArr[1] = 391;
-	_sequenceIdArr[2] = 392;
-	_sequenceIdArr[3] = 393;
-	_sequenceIdArr[4] = 394;
-	_sequenceIdArr[5] = 395;
-	_sequenceIdArr[6] = 396;
-	_sequenceIdArr[7] = 397;
-	_sequenceIdArr[8] = 398;
-	_sequenceIdArr[9] = 399;
-	_sequenceIdArr[10] = 400;
-	_sequenceIdArr[11] = 401;
-	_sequenceIdArr[12] = 402;
-	_resourceIdArr[0] = 238;
-	_resourceIdArr[1] = 42;
-	_resourceIdArr[2] = 2;
-	_resourceIdArr[3] = 37;
-	_resourceIdArr[4] = 35;
-	_resourceIdArr[5] = 38;
-	_resourceIdArr[6] = 39;
-	_resourceIdArr[7] = 40;
-	_resourceIdArr[8] = 41;
-	_resourceIdArr[9] = 36;
-	_resourceIdArr[10] = 41;
-	_resourceIdArr[11] = 388;
-	_resourceIdArr[12] = 387;
-	_sequenceCountArr[0] = 1;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_sequenceCountArr[3] = 1;
-	_sequenceCountArr[4] = 1;
-	_sequenceCountArr[5] = 1;
-	_sequenceCountArr[6] = 1;
-	_sequenceCountArr[7] = 1;
-	_sequenceCountArr[8] = 1;
-	_sequenceCountArr[9] = 1;
-	_sequenceCountArr[10] = 1;
-	_sequenceCountArr[11] = 1;
-	_sequenceCountArr[12] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_canSkip[4] = false;
-	_canSkip[5] = false;
-	_canSkip[6] = false;
-	_canSkip[7] = false;
-	_canSkip[8] = false;
-	_canSkip[9] = false;
-	_canSkip[10] = false;
-	_canSkip[11] = false;
-	_canSkip[12] = false;
-	_itemsCount = 13;
-
-	return -1;
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene48.h b/engines/gnap/scenes/scene48.h
deleted file mode 100644
index 24e54b4462..0000000000
--- a/engines/gnap/scenes/scene48.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* 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.
- *
- */
-
-#ifndef GNAP_SCENE48_H
-#define GNAP_SCENE48_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene48: public CutScene {
-public:
-	Scene48(GnapEngine *vm);
-	~Scene48() {}
-
-	virtual int init();
-};
-
-} // End of namespace Gnap
-#endif // GNAP_SCENE48_H
diff --git a/engines/gnap/scenes/scene54.cpp b/engines/gnap/scenes/scene54.cpp
deleted file mode 100644
index 222c6e81e4..0000000000
--- a/engines/gnap/scenes/scene54.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/* 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 "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene54.h"
-
-namespace Gnap {
-
-Scene541::Scene541(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene541::init() {
-	_sequenceIdArr[0] = 0x1BE;
-	_sequenceIdArr[1] = 0x1BF;
-	_sequenceIdArr[2] = 0x1BA;
-	_sequenceIdArr[3] = 0x1BB;
-	_sequenceIdArr[4] = 0x1BD;
-	_sequenceIdArr[5] = 0x1BC;
-	_resourceIdArr[0] = 0x3C;
-	_resourceIdArr[1] = 0x43;
-	_resourceIdArr[2] = 0x44;
-	if (_vm->isFlag(kGFPictureTaken))
-		_resourceIdArr[3] = 0x47;
-	else
-		_resourceIdArr[3] = 0x46;
-	_resourceIdArr[4] = 0x45;
-	_sequenceCountArr[0] = 1;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 1;
-	_sequenceCountArr[3] = 2;
-	_sequenceCountArr[4] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_canSkip[4] = false;
-	_itemsCount = 5;
-
-	return -1;
-}
-
-Scene542::Scene542(GnapEngine *vm) : CutScene(vm) {}
-
-int Scene542::init() {
-	_sequenceIdArr[0] = 0x1C9;
-	_sequenceIdArr[1] = 0x1C7;
-	_sequenceIdArr[2] = 0x1CC;
-	_sequenceIdArr[3] = 0x1C8;
-	_sequenceIdArr[4] = 0x1CB;
-	_sequenceIdArr[5] = 0x1C0;
-	_sequenceIdArr[6] = 0x1CA;
-	_sequenceIdArr[7] = 0x1CE;
-	_sequenceIdArr[8] = 0x1CD;
-	_sequenceIdArr[9] = 0x1C1;
-	_sequenceIdArr[10] = 0x1C2;
-	_sequenceIdArr[11] = 0x1C3;
-	_sequenceIdArr[12] = 0x1C4;
-	_sequenceIdArr[13] = 0x1C6;
-	_sequenceIdArr[14] = 0x1C5;
-	_sequenceIdArr[15] = 0x1D0;
-	_sequenceIdArr[16] = 0x1D0;
-	_sequenceIdArr[17] = 0x1D0;
-	_resourceIdArr[0] = 0xD5;
-	_resourceIdArr[1] = 0x14C;
-	_resourceIdArr[2] = 0xD5;
-	_resourceIdArr[3] = 0xBF;
-	_resourceIdArr[4] = 0xD6;
-	_resourceIdArr[5] = 0x154;
-	_resourceIdArr[6] = 0x155;
-	_resourceIdArr[7] = 0xB9;
-	_resourceIdArr[8] = 0xBA;
-	_resourceIdArr[9] = 0x17B;
-	_resourceIdArr[10] = 0x17A;
-	_resourceIdArr[11] = 0x17C;
-	_resourceIdArr[12] = 0x17A;
-	_resourceIdArr[13] = 0x1B7;
-	_resourceIdArr[14] = 0x1B8;
-	_resourceIdArr[15] = 0x1B9;
-	_sequenceCountArr[0] = 2;
-	_sequenceCountArr[1] = 1;
-	_sequenceCountArr[2] = 2;
-	_sequenceCountArr[3] = 1;
-	_sequenceCountArr[4] = 1;
-	_sequenceCountArr[5] = 1;
-	_sequenceCountArr[6] = 1;
-	_sequenceCountArr[7] = 1;
-	_sequenceCountArr[8] = 1;
-	_sequenceCountArr[9] = 1;
-	_sequenceCountArr[10] = 1;
-	_sequenceCountArr[11] = 1;
-	_sequenceCountArr[12] = 1;
-	_sequenceCountArr[13] = 1;
-	_sequenceCountArr[14] = 1;
-	_sequenceCountArr[15] = 1;
-	_canSkip[0] = false;
-	_canSkip[1] = false;
-	_canSkip[2] = false;
-	_canSkip[3] = false;
-	_canSkip[4] = false;
-	_canSkip[5] = false;
-	_canSkip[6] = false;
-	_canSkip[7] = false;
-	_canSkip[8] = false;
-	_canSkip[9] = false;
-	_canSkip[10] = false;
-	_canSkip[11] = false;
-	_canSkip[12] = false;
-	_canSkip[13] = true;
-	_canSkip[14] = true;
-	_canSkip[15] = false;
-	_itemsCount = 16;
-
-	return -1;
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene54.h b/engines/gnap/scenes/scene54.h
deleted file mode 100644
index a27d157da4..0000000000
--- a/engines/gnap/scenes/scene54.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* 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.
- *
- */
-
-#ifndef GNAP_SCENE54_H
-#define GNAP_SCENE54_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene541: public CutScene {
-public:
-	Scene541(GnapEngine *vm);
-	~Scene541() {}
-
-	virtual int init();
-};
-
-class Scene542: public CutScene {
-public:
-	Scene542(GnapEngine *vm);
-	~Scene542() {}
-
-	virtual int init();
-};
-} // End of namespace Gnap
-#endif // GNAP_SCENE54_H
diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index 8c16bb593e..309c872526 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -25,6 +25,8 @@
 #include "gnap/resource.h"
 #include "gnap/scenes/scenecore.h"
 
+#include "gnap/scenes/groupcs.h"
+
 #include "gnap/scenes/scene00.h"
 #include "gnap/scenes/scene01.h"
 #include "gnap/scenes/scene02.h"
@@ -41,7 +43,6 @@
 #include "gnap/scenes/scene13.h"
 #include "gnap/scenes/scene14.h"
 #include "gnap/scenes/scene15.h"
-#include "gnap/scenes/scene16.h"
 #include "gnap/scenes/scene17.h"
 #include "gnap/scenes/scene18.h"
 #include "gnap/scenes/scene19.h"
@@ -68,14 +69,11 @@
 #include "gnap/scenes/scene44.h"
 #include "gnap/scenes/scene45.h"
 #include "gnap/scenes/scene46.h"
-#include "gnap/scenes/scene47.h"
-#include "gnap/scenes/scene48.h"
 #include "gnap/scenes/scene49.h"
 #include "gnap/scenes/scene50.h"
 #include "gnap/scenes/scene51.h"
 #include "gnap/scenes/scene52.h"
 #include "gnap/scenes/scene53.h"
-#include "gnap/scenes/scene54.h"
 
 namespace Gnap {