From ee36d5d5e3ae6f5cb357f3d68c711e2fbfbdef8b Mon Sep 17 00:00:00 2001
From: johndoe123 <john_doe@techie.com>
Date: Fri, 14 Sep 2012 14:29:54 +0000
Subject: [PATCH] NEVERHOOD: Add remaining scenes in Module2400

---
 engines/neverhood/module2400.cpp | 32 ++++++++++++++++++++++++++++++++
 engines/neverhood/module2400.h   |  1 +
 2 files changed, 33 insertions(+)

diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp
index 22ea30bb459..02e6225b8aa 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/module2400.cpp
@@ -57,10 +57,27 @@ void Module2400::createScene(int sceneNum, int which) {
 		// TODO Music18hList_play(0xB110382D, 0, 0, 1);
 		_childObject = new Scene2403(_vm, this, which);
 		break;
+	case 4:
+		// TODO Music18hList_stop(0xB110382D, 0, 2);
+		_childObject = new DiskplayerScene(_vm, this, 0);
+		break;
 	case 5:
 		// TODO Music18hList_play(0xB110382D, 0, 2, 1);
 		_childObject = new Scene2406(_vm, this, which);
 		break;
+	case 6:
+		// TODO Music18hList_stop(0xB110382D, 0, 2);
+		createSmackerScene(0x20D80001, true, true, false);
+		break;
+	case 7:
+		_childObject = new Class152(_vm, this, 0x81523218, 0x2321C81D);
+		break;
+	case 8:
+		_childObject = new Class152(_vm, this, 0x08100210, 0x00214089);
+		break;
+	case 9:
+		_childObject = new Class152(_vm, this, 0x8C020505, 0x205018C8);
+		break;
 	}
 	SetUpdateHandler(&Module2400::updateScene);
 	_childObject->handleUpdate();
@@ -91,6 +108,9 @@ void Module2400::updateScene() {
 			else
 				createScene(5, 1);
 			break;
+		case 4:
+			createScene(5, 2);
+			break;
 		case 5:
 			if (_moduleResult == 1)
 				createScene(2, 0);
@@ -101,6 +121,18 @@ void Module2400::updateScene() {
 			else
 				createScene(1, 1);
 			break;
+		case 6:
+			createScene(2, 2);
+			break;
+		case 7:
+			createScene(1, 2);
+			break;
+		case 8:
+			createScene(5, 3);
+			break;
+		case 9:
+			createScene(2, 1);
+			break;
 		}
 	}
 }
diff --git a/engines/neverhood/module2400.h b/engines/neverhood/module2400.h
index 16c1d64625f..e29f03da9af 100644
--- a/engines/neverhood/module2400.h
+++ b/engines/neverhood/module2400.h
@@ -33,6 +33,7 @@
 #include "neverhood/module2100.h"
 #include "neverhood/module2200.h"
 #include "neverhood/module2800.h"
+#include "neverhood/diskplayerscene.h"
 
 namespace Neverhood {