NEVERHOOD: Rename Class152 to StaticScene

8 files changed, 33 insertions, 33 deletions

diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index 09299de118..f281a17b3d 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -300,7 +300,7 @@ void GameModule::startup() {
 //	createModule(1500, 0); // Logos and intro video //Real
 #if 1
 	_vm->gameState().sceneNum = 6;
-	createModule(1300, -1);
+	createModule(1000, -1);
 #endif
 #if 0
 	_vm->gameState().sceneNum = 0;
diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 1e844c75bd..ab4c051f5a 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -62,7 +62,7 @@ void Module1000::createScene(int sceneNum, int which) {
 		break;
 	case 2:
 		_vm->_soundMan->startMusic(0x061880C6, 0, 0);
-		_childObject = new Class152(_vm, this, 0xC084110C, 0x41108C00);
+		_childObject = new StaticScene(_vm, this, 0xC084110C, 0x41108C00);
 		break;
 	case 3:
 		_vm->_soundMan->stopMusic(0x061880C6, 0, 2);
@@ -1563,21 +1563,21 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam &param, Entit
 	return messageResult;
 }
 
-// Class152
+// StaticScene
 
-Class152::Class152(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash)
+StaticScene::StaticScene(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash)
 	: Scene(vm, parentModule, true) {
 
 	_surfaceFlag = false;
 
-	SetMessageHandler(&Class152::handleMessage);
+	SetMessageHandler(&StaticScene::handleMessage);
 	
 	setBackground(backgroundFileHash);
 	setPalette(backgroundFileHash);
 	insertMouse435(cursorFileHash, 20, 620);
 }
 
-uint32 Class152::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 StaticScene::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	Scene::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x0001:
diff --git a/engines/neverhood/module1000.h b/engines/neverhood/module1000.h
index 60eb2fb7d8..db8fdb6448 100644
--- a/engines/neverhood/module1000.h
+++ b/engines/neverhood/module1000.h
@@ -103,9 +103,9 @@ protected:
 
 // TODO: Move this to some common file since it's used several times
 
-class Class152 : public Scene {
+class StaticScene : public Scene {
 public:
-	Class152(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash);
+	StaticScene(NeverhoodEngine *vm, Module *parentModule, uint32 backgroundFileHash, uint32 cursorFileHash);
 protected:
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index f703971bf3..36be19a01f 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -202,14 +202,14 @@ void Module2200::createScene(int sceneNum, int which) {
 	case 47:
 		if (!getGlobalVar(0x98109F12)) {
 			if (getGlobalVar(0x4D080E54))
-				_childObject = new Class152(_vm, this, 0x83110287, 0x10283839);
+				_childObject = new StaticScene(_vm, this, 0x83110287, 0x10283839);
 			else
-				_childObject = new Class152(_vm, this, 0x83412B9D, 0x12B9983C);
+				_childObject = new StaticScene(_vm, this, 0x83412B9D, 0x12B9983C);
 		} else {
 			if (getGlobalVar(0x4D080E54))
-				_childObject = new Class152(_vm, this, 0x48632087, 0x3208348E);
+				_childObject = new StaticScene(_vm, this, 0x48632087, 0x3208348E);
 			else
-				_childObject = new Class152(_vm, this, 0x08C74886, 0x74882084);
+				_childObject = new StaticScene(_vm, this, 0x08C74886, 0x74882084);
 		}
 		break;
 	}
diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp
index 6c120069b7..5dcfa8dd55 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/module2400.cpp
@@ -70,13 +70,13 @@ void Module2400::createScene(int sceneNum, int which) {
 		createSmackerScene(0x20D80001, true, true, false);
 		break;
 	case 7:
-		_childObject = new Class152(_vm, this, 0x81523218, 0x2321C81D);
+		_childObject = new StaticScene(_vm, this, 0x81523218, 0x2321C81D);
 		break;
 	case 8:
-		_childObject = new Class152(_vm, this, 0x08100210, 0x00214089);
+		_childObject = new StaticScene(_vm, this, 0x08100210, 0x00214089);
 		break;
 	case 9:
-		_childObject = new Class152(_vm, this, 0x8C020505, 0x205018C8);
+		_childObject = new StaticScene(_vm, this, 0x8C020505, 0x205018C8);
 		break;
 	}
 	SetUpdateHandler(&Module2400::updateScene);
diff --git a/engines/neverhood/module2500.cpp b/engines/neverhood/module2500.cpp
index 1efcb25ed1..cc0dda9837 100644
--- a/engines/neverhood/module2500.cpp
+++ b/engines/neverhood/module2500.cpp
@@ -126,9 +126,9 @@ void Module2500::createScene(int sceneNum, int which) {
 		break;
 	case 9:
 		if (getGlobalVar(0xD0A14D10))
-			_childObject = new Class152(_vm, this, 0xC62A0645, 0xA0641C6A);
+			_childObject = new StaticScene(_vm, this, 0xC62A0645, 0xA0641C6A);
 		else
-			_childObject = new Class152(_vm, this, 0x7A343546, 0x435427AB);
+			_childObject = new StaticScene(_vm, this, 0x7A343546, 0x435427AB);
 		break;
 	}
 	SetUpdateHandler(&Module2500::updateScene);
diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
index 0a59abf0f2..f9a5c2abce 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/module2700.cpp
@@ -267,7 +267,7 @@ void Module2700::createScene(int sceneNum, int which) {
 		createScene2704(which, 0x004B1E60, 150);
 		break;
 	case 30:
-		_childObject = new Class152(_vm, this, 0x09507248, 0x0724C09D);
+		_childObject = new StaticScene(_vm, this, 0x09507248, 0x0724C09D);
 		break;
 	case 31:
 //TODO		_childObject = new Scene2732(_vm, this, which);
diff --git a/engines/neverhood/module2800.cpp b/engines/neverhood/module2800.cpp
index 6d7e49f5c7..7a35ddda23 100644
--- a/engines/neverhood/module2800.cpp
+++ b/engines/neverhood/module2800.cpp
@@ -70,7 +70,7 @@ void Module2800::createScene(int sceneNum, int which) {
 		if (_flag) {
 			_childObject = new Scene2802(_vm, this, which);
 		} else {
-			_childObject = new Class152(_vm, this, 0x000C6444, 0xC6440008);
+			_childObject = new StaticScene(_vm, this, 0x000C6444, 0xC6440008);
 		}
 #endif		
 		break;
@@ -119,39 +119,39 @@ void Module2800::createScene(int sceneNum, int which) {
 		break;
 	case 12:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x0000A245, 0x0A241008);
+		_childObject = new StaticScene(_vm, this, 0x0000A245, 0x0A241008);
 		break;
 	case 13:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x81C60635, 0x60631814);
+		_childObject = new StaticScene(_vm, this, 0x81C60635, 0x60631814);
 		break;
 	case 14:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0xCA811204, 0x11200CA0);
+		_childObject = new StaticScene(_vm, this, 0xCA811204, 0x11200CA0);
 		break;
 	case 15:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x2D438A00, 0x38A042DC);
+		_childObject = new StaticScene(_vm, this, 0x2D438A00, 0x38A042DC);
 		break;
 	case 16:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x0A806204, 0x062000A0);
+		_childObject = new StaticScene(_vm, this, 0x0A806204, 0x062000A0);
 		break;
 	case 17:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x010F9284, 0xF9280018);
+		_childObject = new StaticScene(_vm, this, 0x010F9284, 0xF9280018);
 		break;
 	case 18:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x0100022B, 0x0022F018);
+		_childObject = new StaticScene(_vm, this, 0x0100022B, 0x0022F018);
 		break;
 	case 19:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x10866205, 0x66201100);
+		_childObject = new StaticScene(_vm, this, 0x10866205, 0x66201100);
 		break;
 	case 20:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x01C58000, 0x58004014);
+		_childObject = new StaticScene(_vm, this, 0x01C58000, 0x58004014);
 		break;
 	case 21:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
@@ -159,22 +159,22 @@ void Module2800::createScene(int sceneNum, int which) {
 		break;
 	case 22:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x9408121E, 0x8121A948);
+		_childObject = new StaticScene(_vm, this, 0x9408121E, 0x8121A948);
 		break;
 	case 23:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x048C0600, 0xC0604040);
+		_childObject = new StaticScene(_vm, this, 0x048C0600, 0xC0604040);
 		break;
 	case 24:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
-		_childObject = new Class152(_vm, this, 0x04270A94, 0x70A9004A);
+		_childObject = new StaticScene(_vm, this, 0x04270A94, 0x70A9004A);
 		break;
 	case 25:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);
 		if (getGlobalVar(0x190A1D18))
-			_childObject = new Class152(_vm, this, 0x01600204, 0x0020001E);
+			_childObject = new StaticScene(_vm, this, 0x01600204, 0x0020001E);
 		else
-			_childObject = new Class152(_vm, this, 0x08611204, 0x1120008E);
+			_childObject = new StaticScene(_vm, this, 0x08611204, 0x1120008E);
 		break;
 	case 26:
 		_vm->_soundMan->startMusic(0xD2FA4D14, 0, 2);