NEVERHOOD: Rename stuff in several modules

11 files changed, 76 insertions, 76 deletions

diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index edc9b5594f..d1321056f4 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -309,8 +309,8 @@ void GameModule::startup() {
 
 
 #if 1
-	_vm->gameState().sceneNum = 4;
-	createModule(1700, -1);
+	_vm->gameState().sceneNum = 0;
+	createModule(2100, -1);
 #endif
 #if 0
 	_vm->gameState().sceneNum = 0;
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp
index 88b576ac39..e5c25ca5ec 100644
--- a/engines/neverhood/module1400.cpp
+++ b/engines/neverhood/module1400.cpp
@@ -645,7 +645,7 @@ void AsCommonProjector::stStartSuckedIn() {
 }
 
 Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
-	: Scene(vm, parentModule, true), _projectorBorderFlag(false), _class427(NULL), _asProjector(NULL), 
+	: Scene(vm, parentModule, true), _projectorBorderFlag(false), _ssFloorButton(NULL), _asProjector(NULL), 
 	_asPipe(NULL), _asMouse(NULL), _asCheese(NULL), _asBackDoor(NULL), 
 	_sprite1(NULL), _sprite2(NULL), _sprite3(NULL), _ssButton(NULL) {
 
@@ -658,7 +658,7 @@ Scene1401::Scene1401(NeverhoodEngine *vm, Module *parentModule, int which)
 	setPalette(0x08221FA5);
 	insertMouse433(0x21FA108A);
 	
-	_class427 = insertSprite<Class427>(this, 0x980F3124, 0x12192892, 100, 0);
+	_ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x980F3124, 0x12192892, 100, 0);
 	_asPipe = insertSprite<AsScene1401Pipe>();
 
 	if (!getGlobalVar(0x01023818)) {
@@ -733,7 +733,7 @@ uint32 Scene1401::handleMessage(int messageNum, const MessageParam &param, Entit
 	switch (messageNum) {
 	case 0x100D:
 		if (param.asInteger() == 0x02144CB1) {
-			sendEntityMessage(_klayman, 0x1014, _class427);
+			sendEntityMessage(_klayman, 0x1014, _ssFloorButton);
 		} else if (param.asInteger() == 0x402064D8) {
 			sendEntityMessage(_klayman, 0x1014, _ssButton);
 		} else if (param.asInteger() == 0x01C66840) {
@@ -752,7 +752,7 @@ uint32 Scene1401::handleMessage(int messageNum, const MessageParam &param, Entit
 		}			
 		break;
 	case 0x480B:
-		if (sender == _class427) {
+		if (sender == _ssFloorButton) {
 			sendMessage(_asPipe, 0x2000, 0);
 			if (!getGlobalVar(0x01023818)) {
 				sendMessage(_asMouse, 0x4839, 0);
diff --git a/engines/neverhood/module1400.h b/engines/neverhood/module1400.h
index 8cabc99002..437632dd8f 100644
--- a/engines/neverhood/module1400.h
+++ b/engines/neverhood/module1400.h
@@ -131,7 +131,7 @@ public:
 	Scene1401(NeverhoodEngine *vm, Module *parentModule, int which);
 protected:
 	bool _projectorBorderFlag;
-	Sprite *_class427;
+	Sprite *_ssFloorButton;
 	AsCommonProjector *_asProjector;
 	Sprite *_asPipe;
 	Sprite *_asMouse;
diff --git a/engines/neverhood/module1800.cpp b/engines/neverhood/module1800.cpp
index 14c48681fe..43355955d5 100644
--- a/engines/neverhood/module1800.cpp
+++ b/engines/neverhood/module1800.cpp
@@ -156,6 +156,7 @@ void Module1800::updateScene() {
 			leaveModule(3);
 			break;
 		case 8:
+			// NOTE: After Klayman jumped into the hole and died...
 			leaveModule(1);
 			// TODO GameState stuff
 			break;
diff --git a/engines/neverhood/module1900.cpp b/engines/neverhood/module1900.cpp
index 77f031b19b..5bb03d4aa1 100644
--- a/engines/neverhood/module1900.cpp
+++ b/engines/neverhood/module1900.cpp
@@ -533,7 +533,7 @@ void AsScene1907WaterHint::update() {
 	AnimatedSprite::updatePosition();
 }
 
-uint32 AsScene1907WaterHint::handleMessage46BA20(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 AsScene1907WaterHint::hmShowing(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x3002:
@@ -546,7 +546,7 @@ uint32 AsScene1907WaterHint::handleMessage46BA20(int messageNum, const MessagePa
 void AsScene1907WaterHint::show() {
 	setVisible(true);
 	startAnimation(0x110A1061, 0, -1);
-	SetMessageHandler(&AsScene1907WaterHint::handleMessage46BA20);
+	SetMessageHandler(&AsScene1907WaterHint::hmShowing);
 	NextState(&AsScene1907WaterHint::hide);
 }
 
@@ -561,9 +561,6 @@ Scene1907::Scene1907(NeverhoodEngine *vm, Module *parentModule, int which)
 	_moveDownCountdown(0), _moveUpCountdown(0), _countdown3(0), _hasPlugInFailed(false) {
 	
 	_surfaceFlag = true;
-
-	//setGlobalVar(0x10938830, 1);
-	
 	setBackground(0x20628E05);
 	setPalette(0x20628E05);
 
diff --git a/engines/neverhood/module1900.h b/engines/neverhood/module1900.h
index 386d1c9fdb..5f26c9e7ae 100644
--- a/engines/neverhood/module1900.h
+++ b/engines/neverhood/module1900.h
@@ -98,7 +98,7 @@ public:
 	void show();
 protected:
 	void update();
-	uint32 handleMessage46BA20(int messageNum, const MessageParam &param, Entity *sender);
+	uint32 hmShowing(int messageNum, const MessageParam &param, Entity *sender);
 	void hide();
 };
 
diff --git a/engines/neverhood/module2000.cpp b/engines/neverhood/module2000.cpp
index d1d6b82577..6ff8a405c3 100644
--- a/engines/neverhood/module2000.cpp
+++ b/engines/neverhood/module2000.cpp
@@ -98,6 +98,8 @@ void Module2000::updateScene() {
 Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 
+	Sprite *tempSprite;
+
 	_surfaceFlag = true;
 	SetMessageHandler(&Scene2001::handleMessage);
 
@@ -105,7 +107,7 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which)
 	setPalette(0xA6417244);
 	insertMouse433(0x17240A6C);
 
-	_class401 = insertStaticSprite(0x0D641724, 1100);
+	tempSprite = insertStaticSprite(0x0D641724, 1100);
 
 	if (which < 0) {
 		insertKlayman<KmScene2001>(300, 345);
@@ -133,7 +135,7 @@ Scene2001::Scene2001(NeverhoodEngine *vm, Module *parentModule, int which)
 		_klayman->setDoDeltaX(1);
 	}
 	
-	_klayman->setClipRect(_class401->getDrawRect().x, 0, 640, 480);
+	_klayman->setClipRect(tempSprite->getDrawRect().x, 0, 640, 480);
 	
 }
 
diff --git a/engines/neverhood/module2000.h b/engines/neverhood/module2000.h
index 8e741b357e..8533092b2c 100644
--- a/engines/neverhood/module2000.h
+++ b/engines/neverhood/module2000.h
@@ -46,7 +46,6 @@ class Scene2001 : public Scene {
 public:
 	Scene2001(NeverhoodEngine *vm, Module *parentModule, int which);
 protected:
-	Sprite *_class401;
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
 
diff --git a/engines/neverhood/module2100.cpp b/engines/neverhood/module2100.cpp
index 98b6e03cd4..06806c7ca1 100644
--- a/engines/neverhood/module2100.cpp
+++ b/engines/neverhood/module2100.cpp
@@ -77,7 +77,7 @@ void Module2100::updateScene() {
 
 // Scene2101
 
-Class538::Class538(NeverhoodEngine *vm, bool flag)
+AsScene2101Door::AsScene2101Door(NeverhoodEngine *vm, bool flag)
 	: AnimatedSprite(vm, 1100) {
 
 	// TODO createSurface3(100, dword_4B9018);
@@ -85,7 +85,7 @@ Class538::Class538(NeverhoodEngine *vm, bool flag)
 	_x = 320;
 	_y = 240;
 	SetUpdateHandler(&AnimatedSprite::update);
-	SetMessageHandler(&Class538::handleMessage);
+	SetMessageHandler(&AsScene2101Door::handleMessage);
 	if (flag) {
 		startAnimation(0x0C202B9C, -1, -1);
 		_newStickFrameIndex = -2;
@@ -94,52 +94,52 @@ Class538::Class538(NeverhoodEngine *vm, bool flag)
 	}
 }
 
-uint32 Class538::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 AsScene2101Door::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x3002:
 		gotoNextState();
 		break;
 	case 0x4808:
-		openDoor();
+		stOpenDoor();
 		break;
 	case 0x4809:
-		closeDoor();
+		stCloseDoor();
 		break;
 	}
 	return messageResult;
 }
 
-void Class538::openDoor() {
+void AsScene2101Door::stOpenDoor() {
 	startAnimation(0x0C202B9C, 0, -1);
 	_newStickFrameIndex = -2;
 	setVisible(true);
 	playSound(0, calcHash("fxDoorOpen32"));
 }
 
-void Class538::closeDoor() {
+void AsScene2101Door::stCloseDoor() {
 	startAnimation(0xC222A8D4, 0, -1);
 	_newStickFrameIndex = -2;
 	setVisible(true);
-	NextState(&Class538::hide);
+	NextState(&AsScene2101Door::stCloseDoorDone);
 	playSound(0, calcHash("fxDoorClose32"));
 }
 
-void Class538::hide() {
+void AsScene2101Door::stCloseDoorDone() {
 	stopAnimation();
 	setVisible(false);
 }
 
-Class539::Class539(NeverhoodEngine *vm, Sprite *klayman)
+AsScene2101HitByDoorEffect::AsScene2101HitByDoorEffect(NeverhoodEngine *vm, Sprite *klayman)
 	: AnimatedSprite(vm, 1400), _klayman(klayman) {
 	
 	SetUpdateHandler(&AnimatedSprite::update);
-	SetMessageHandler(&Class539::handleMessage);
+	SetMessageHandler(&AsScene2101HitByDoorEffect::handleMessage);
 	createSurface(1200, 88, 165);
 	setVisible(false);
 }
 
-uint32 Class539::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 AsScene2101HitByDoorEffect::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x2001:
@@ -156,12 +156,12 @@ uint32 Class539::handleMessage(int messageNum, const MessageParam &param, Entity
 	return messageResult;
 }
 
-Class427::Class427(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash)
+SsCommonFloorButton::SsCommonFloorButton(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash)
 	: StaticSprite(vm, 1100), _parentScene(parentScene), _countdown(0),
 	_fileHash1(fileHash1), _fileHash2(fileHash2), _soundFileHash(soundFileHash) {
 
-	SetUpdateHandler(&Class427::update);
-	SetMessageHandler(&Class427::handleMessage);
+	SetUpdateHandler(&SsCommonFloorButton::update);
+	SetMessageHandler(&SsCommonFloorButton::handleMessage);
 	if (_soundFileHash == 0)
 		_soundFileHash = 0x44141000;
 	createSurface(1010, 61, 30);
@@ -172,7 +172,7 @@ Class427::Class427(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, ui
 		setVisible(false);
 }
 
-void Class427::update() {
+void SsCommonFloorButton::update() {
 	if (_countdown != 0 && (--_countdown == 0)) {
 		sendMessage(_parentScene, 0x1022, 1010);
 		if (_fileHash1) {
@@ -183,7 +183,7 @@ void Class427::update() {
 	}
 }	
 	
-uint32 Class427::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 SsCommonFloorButton::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x480B:
@@ -202,6 +202,8 @@ uint32 Class427::handleMessage(int messageNum, const MessageParam &param, Entity
 Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 	
+	Sprite *tempSprite;
+	
 	_surfaceFlag = true;
 	SetMessageHandler(&Scene2101::handleMessage);
 	SetUpdateHandler(&Scene2101::update);
@@ -211,8 +213,8 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)
 	insertMouse433(0x4230144A);
 
 	insertStaticSprite(0x00502330, 1100);
-	_sprite1 = insertStaticSprite(0x78492010, 1100);
-	_class427 = insertSprite<Class427>(this, 0x72427010, 0x32423010, 200, 0);
+	tempSprite = insertStaticSprite(0x78492010, 1100);
+	_ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x72427010, 0x32423010, 200, 0);
 	_asTape1 = insertSprite<AsScene1201Tape>(this, 18, 1100, 412, 443, 0x9148A011);
 	_vm->_collisionMan->addSprite(_asTape1);
 	_asTape2 = insertSprite<AsScene1201Tape>(this, 11, 1100, 441, 443, 0x9148A011);
@@ -222,71 +224,71 @@ Scene2101::Scene2101(NeverhoodEngine *vm, Module *parentModule, int which)
 		insertKlayman<KmScene2101>(380, 438);
 		setMessageList(0x004B8E48);
 		sendMessage(this, 0x2000, 0);
-		_class538 = insertSprite<Class538>(false);
-		_value1 = 1;
+		_asDoor = insertSprite<AsScene2101Door>(false);
+		_doorStatus = 1;
 		_countdown1 = 0;
 	} else if (which == 1) {
 		insertKlayman<KmScene2101>(640, 438);
 		setMessageList(0x004B8E50);
 		sendMessage(this, 0x2000, 0);
-		_class538 = insertSprite<Class538>(true);
-		_value1 = 2;
+		_asDoor = insertSprite<AsScene2101Door>(true);
+		_doorStatus = 2;
 		_countdown1 = 48;
 	} else if (which == 2) {
 		insertKlayman<KmScene2101>(115, 438);
 		sendMessage(_klayman, 0x2000, 1);
 		setMessageList(0x004B8F58);
 		sendMessage(this, 0x2000, 1);
-		_class538 = insertSprite<Class538>(false);
-		_value1 = 1;
+		_asDoor = insertSprite<AsScene2101Door>(false);
+		_doorStatus = 1;
 		_countdown1 = 0;
 	} else if (which == 3) {
 		insertKlayman<KmScene2101>(115, 438);
 		sendMessage(_klayman, 0x2000, 1);
 		setMessageList(0x004B8EB0);
 		sendMessage(this, 0x2000, 1);
-		_class538 = insertSprite<Class538>(false);
-		_value1 = 1;
+		_asDoor = insertSprite<AsScene2101Door>(false);
+		_doorStatus = 1;
 		_countdown1 = 0;
 	} else {
 		insertKlayman<KmScene2101>(115, 438);
 		sendMessage(_klayman, 0x2000, 1);
 		setMessageList(0x004B8EA0);
 		sendMessage(this, 0x2000, 1);
-		_class538 = insertSprite<Class538>(false);
-		_value1 = 1;
+		_asDoor = insertSprite<AsScene2101Door>(false);
+		_doorStatus = 1;
 		_countdown1 = 0;
 	}
 	
-	_class539 = insertSprite<Class539>(_klayman);
-	_klayman->setClipRect(0, 0, _sprite1->getDrawRect().x2(), 480);
+	_asHitByDoorEffect = insertSprite<AsScene2101HitByDoorEffect>(_klayman);
+	_klayman->setClipRect(0, 0, tempSprite->getDrawRect().x2(), 480);
 	
 }
 
 void Scene2101::update() {
 	if (_countdown1 != 0) {
-		if (_value1 == 2) {
+		if (_doorStatus == 2) {
 			if (--_countdown1 == 0) {
-				sendMessage(_class538, 0x4809, 0);
-				_value1 = 1;
+				sendMessage(_asDoor, 0x4809, 0);
+				_doorStatus = 1;
 			}
 		} else {
 			if (_klayman->getX() > 575)
 				_messageListFlag  = false;
 			if (--_countdown1 == 0) {
 				if (_klayman->getX() < 480) {
-					sendMessage(_class538, 0x4809, 0);
-					_value1 = 1;
+					sendMessage(_asDoor, 0x4809, 0);
+					_doorStatus = 1;
 				} else if (_klayman->getX() >= 480 && _klayman->getX() <= 575) {
 					_klayman->setDoDeltaX(0);
 					setMessageList2(0x004B8F48);
-					sendMessage(_class538, 0x4809, 0);
-					sendMessage(_class539, 0x2001, 0);
-					_value1 = 1;
+					sendMessage(_asDoor, 0x4809, 0);
+					sendMessage(_asHitByDoorEffect, 0x2001, 0);
+					_doorStatus = 1;
 				}
 			}
 		}
-	} else if (_value1 == 1 && _messageValue >= 0 && _klayman->getX() > 470 /* TODO ! && _messageList2 != 0x004B8F48*/) {
+	} else if (_doorStatus == 1 && _messageValue >= 0 && _klayman->getX() > 470 /* TODO ! && _messageList2 != 0x004B8F48*/) {
 		setMessageList2(0x004B8F50);
 	}
 	Scene::update();
@@ -297,9 +299,9 @@ uint32 Scene2101::handleMessage(int messageNum, const MessageParam &param, Entit
 	switch (messageNum) {
 	case 0x100D:
 		if (param.asInteger() == 0x02144CB1) {
-			sendEntityMessage(_klayman, 0x1014, _class427);
+			sendEntityMessage(_klayman, 0x1014, _ssFloorButton);
 		} else if (param.asInteger() == 0x21E64A00) {
-			if (_value1 == 0) {
+			if (_doorStatus == 0) {
 				setMessageList(0x004B8E80);
 			} else {
 				setMessageList(0x004B8EC8);
@@ -318,9 +320,9 @@ uint32 Scene2101::handleMessage(int messageNum, const MessageParam &param, Entit
 		}
 		break;
 	case 0x480B:
-		if (sender == _class427 && _value1 == 1) {
-			sendMessage(_class538, 0x4808, 0);
-			_value1 = 0;
+		if (sender == _ssFloorButton && _doorStatus == 1) {
+			sendMessage(_asDoor, 0x4808, 0);
+			_doorStatus = 0;
 			_countdown1 = 90;
 		}
 		break;
diff --git a/engines/neverhood/module2100.h b/engines/neverhood/module2100.h
index ff6898c7b0..4690913cb3 100644
--- a/engines/neverhood/module2100.h
+++ b/engines/neverhood/module2100.h
@@ -41,27 +41,27 @@ protected:
 
 // Scene1901
 
-class Class538 : public AnimatedSprite {
+class AsScene2101Door : public AnimatedSprite {
 public:
-	Class538(NeverhoodEngine *vm, bool flag);
+	AsScene2101Door(NeverhoodEngine *vm, bool flag);
 protected:
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
-	void openDoor();
-	void closeDoor();
-	void hide();
+	void stOpenDoor();
+	void stCloseDoor();
+	void stCloseDoorDone();
 };
 
-class Class539 : public AnimatedSprite {
+class AsScene2101HitByDoorEffect : public AnimatedSprite {
 public:
-	Class539(NeverhoodEngine *vm, Sprite *klayman);
+	AsScene2101HitByDoorEffect(NeverhoodEngine *vm, Sprite *klayman);
 protected:
 	Sprite *_klayman;
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
 
-class Class427 : public StaticSprite {
+class SsCommonFloorButton : public StaticSprite {
 public:
-	Class427(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash);
+	SsCommonFloorButton(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash);
 protected:
 	Scene *_parentScene;
 	uint32 _soundFileHash;
@@ -76,14 +76,13 @@ class Scene2101 : public Scene {
 public:
 	Scene2101(NeverhoodEngine *vm, Module *parentModule, int which);
 protected:
-	Sprite *_sprite1;
-	Sprite *_class427;
+	Sprite *_ssFloorButton;
 	Sprite *_asTape1;
 	Sprite *_asTape2;
-	Sprite *_class538;
-	Sprite *_class539;
+	Sprite *_asDoor;
+	Sprite *_asHitByDoorEffect;
 	int _countdown1;
-	int _value1;
+	int _doorStatus;
 	void update();
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
diff --git a/engines/neverhood/module2400.cpp b/engines/neverhood/module2400.cpp
index 5dcfa8dd55..e2973ecc8a 100644
--- a/engines/neverhood/module2400.cpp
+++ b/engines/neverhood/module2400.cpp
@@ -409,7 +409,7 @@ Scene2401::Scene2401(NeverhoodEngine *vm, Module *parentModule, int which)
 	_asFlowingWater = insertSprite<AsScene2401FlowingWater>();
 	insertStaticSprite(0x90C0A4B4, 200);
 	_ssButton = insertSprite<SsCommonButtonSprite>(this, 0x0092916A, 100, 0);
-	_ssFloorButton = insertSprite<Class427>(this, 0x28001120, 0x00911068, 100, 0);
+	_ssFloorButton = insertSprite<SsCommonFloorButton>(this, 0x28001120, 0x00911068, 100, 0);
 
 	for (uint i = 0; i < 5; i++)
 		_asWaterFlushing[i] = insertSprite<AsScene2401WaterFlushing>(kScene2401Points[i].x, kScene2401Points[i].y);