NEVERHOOD: Rename stuff in Module2700

- Also fix the clipRect in Scene2701
scummvm · May 8, 2013 · 016638b · 016638b
1 parent 5aee04b
commit 016638b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
@@ -310,8 +310,8 @@ void GameModule::startup() {
 
 #if 1
 	_vm->gameState().which = 0;
-	_vm->gameState().sceneNum = 11;
-	createModule(2800, -1);
+	_vm->gameState().sceneNum = 0;
+	createModule(2700, -1);
 #endif
 #if 0
 	_vm->gameState().sceneNum = 0;

diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
@@ -591,7 +591,7 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which)
 	: Scene(vm, parentModule, true) {
 
 	Sprite *tempSprite;
-
+	
 	NRect clipRect;
 	SceneInfo2700 *sceneInfo = _vm->_staticData->getSceneInfo2700(0x004B2240);
 	setGlobalVar(0x21E60190, 1);
@@ -608,7 +608,7 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which)
 
 	tempSprite = insertStaticSprite(0x1E086325, 1200);
 
-	clipRect.set(0, 0, 640, tempSprite->getDrawRect().x2());
+	clipRect.set(0, 0, 640, tempSprite->getDrawRect().y2());
 
 	if (sceneInfo->class437Filename) {
 
@@ -625,7 +625,7 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which)
 	}
 
 	_asCarConnector = insertSprite<AsCommonCarConnector>(_asCar);
-	
+
 	_which1 = sceneInfo->which1;
 	_which2 = sceneInfo->which2;
 
@@ -649,23 +649,23 @@ Scene2701::Scene2701(NeverhoodEngine *vm, Module *parentModule, int which)
 	_asCarConnector->setClipRect(clipRect);
 
 	if (which == 1) {
-		SetMessageHandler(&Scene2701::handleMessage42F500);
+		SetMessageHandler(&Scene2701::hmRidingCar);
 	} else {
 		sendMessage(_asCar, 0x2009, 0);
-		SetMessageHandler(&Scene2701::handleMessage42F600);
+		SetMessageHandler(&Scene2701::hmCarAtHome);
 	}
 
 }
 
-uint32 Scene2701::handleMessage42F500(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 Scene2701::hmRidingCar(int messageNum, const MessageParam &param, Entity *sender) {
 	Scene::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x0001:
 		sendPointMessage(_asCar, 0x2004, param.asPoint());
 		break;
 	case 0x2005:
 		if (_which1 >= 0)
-			SetMessageHandler(&Scene2701::handleMessage42F600);
+			SetMessageHandler(&Scene2701::hmCarAtHome);
 		break;
 	case 0x2006:
 		if (_which2 >= 0)
@@ -678,15 +678,15 @@ uint32 Scene2701::handleMessage42F500(int messageNum, const MessageParam &param,
 	return 0;
 }
 
-uint32 Scene2701::handleMessage42F600(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 Scene2701::hmCarAtHome(int messageNum, const MessageParam &param, Entity *sender) {
 	Scene::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x0001:
 		if (param.asPoint().x >= 385) {
 			leaveScene(0);
 		} else {
 			sendPointMessage(_asCar, 0x2004, param.asPoint());
-			SetMessageHandler(&Scene2701::handleMessage42F500);
+			SetMessageHandler(&Scene2701::hmRidingCar);
 		}
 		break;
 	case 0x200D:

diff --git a/engines/neverhood/module2700.h b/engines/neverhood/module2700.h
@@ -94,8 +94,8 @@ class Scene2701 : public Scene {
 	Sprite *_asCarConnector;
 	int _which1, _which2;
 	NPointArray *_trackPoints;
-	uint32 handleMessage42F500(int messageNum, const MessageParam &param, Entity *sender);
-	uint32 handleMessage42F600(int messageNum, const MessageParam &param, Entity *sender);
+	uint32 hmRidingCar(int messageNum, const MessageParam &param, Entity *sender);
+	uint32 hmCarAtHome(int messageNum, const MessageParam &param, Entity *sender);
 };
 
 class Scene2702 : public Scene {