NEVERHOOD: Add Scene2706

- Move calcDistance from Class521 to graphics.cpp

7 files changed, 159 insertions, 16 deletions

diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp
index 9bdaa865d4..9ed447a925 100644
--- a/engines/neverhood/gamemodule.cpp
+++ b/engines/neverhood/gamemodule.cpp
@@ -297,7 +297,7 @@ void GameModule::startup() {
 	createModule(2600, -1);
 #endif
 #if 1
-	_vm->gameState().which = 0;
+	_vm->gameState().which = 4;
 	_vm->gameState().sceneNum = 5;
 	createModule(2700, -1);
 #endif
diff --git a/engines/neverhood/graphics.cpp b/engines/neverhood/graphics.cpp
index 900ad57d56..5bb9424f57 100644
--- a/engines/neverhood/graphics.cpp
+++ b/engines/neverhood/graphics.cpp
@@ -312,4 +312,10 @@ void unpackSpriteNormal(byte *source, int width, int height, byte *dest, int des
 
 }
 
+int calcDistance(int16 x1, int16 y1, int16 x2, int16 y2) {
+	int16 deltaX = ABS(x1 - x2);
+	int16 deltaY = ABS(y1 - y2);
+	return sqrt((double)(deltaX * deltaX + deltaY * deltaY));
+}
+
 } // End of namespace Neverhood
diff --git a/engines/neverhood/graphics.h b/engines/neverhood/graphics.h
index 08fa1f5df0..c2adb11913 100644
--- a/engines/neverhood/graphics.h
+++ b/engines/neverhood/graphics.h
@@ -127,6 +127,7 @@ void parseBitmapResource(byte *sprite, bool *rle, NDimensions *dimensions, NPoin
 void unpackSpriteRle(byte *source, int width, int height, byte *dest, int destPitch, bool flipX, bool flipY);
 void unpackSpriteRleRepl(byte *source, int width, int height, byte *dest, int destPitch, byte oldColor, byte newColor, bool flipX, bool flipY);
 void unpackSpriteNormal(byte *source, int width, int height, byte *dest, int destPitch, bool flipX, bool flipY);
+int calcDistance(int16 x1, int16 y1, int16 x2, int16 y2);
 
 } // End of namespace Neverhood
 
diff --git a/engines/neverhood/module1600.cpp b/engines/neverhood/module1600.cpp
index 94b836a26f..15e24743a6 100644
--- a/engines/neverhood/module1600.cpp
+++ b/engines/neverhood/module1600.cpp
@@ -973,12 +973,6 @@ void Class521::sub45E0A0() {
 	// TODO
 }
 
-int Class521::calcDistance(int16 x1, int16 y1, int16 x2, int16 y2) {
-	int16 deltaX = ABS(x1 - x2);
-	int16 deltaY = ABS(y1 - y2);
-	return sqrt(deltaX * deltaX + deltaY * deltaY);
-}
-
 Class546::Class546(NeverhoodEngine *vm, Scene *parentScene)
 	: AnimatedSprite(vm, 0x08C80144, 900, 320, 240), _soundResource(vm),
 	_parentScene(parentScene) {
diff --git a/engines/neverhood/module1600.h b/engines/neverhood/module1600.h
index 1096377938..efb2b943ab 100644
--- a/engines/neverhood/module1600.h
+++ b/engines/neverhood/module1600.h
@@ -103,7 +103,6 @@ protected:
 	void suMoveToNextPoint();
 	void suMoveToPrevPoint();
 	void sub45E0A0();
-	int calcDistance(int16 x1, int16 y1, int16 x2, int16 y2);
 };
 
 class Class546 : public AnimatedSprite {
diff --git a/engines/neverhood/module2700.cpp b/engines/neverhood/module2700.cpp
index f5dc0785b5..7d09b66e98 100644
--- a/engines/neverhood/module2700.cpp
+++ b/engines/neverhood/module2700.cpp
@@ -141,7 +141,7 @@ void Module2700::createScene(int sceneNum, int which) {
 		break;
 	case 5:
 		if (which >= 4) {
-//TODO		_childObject = new Scene2706(_vm, this, which);
+			_childObject = new Scene2706(_vm, this, which);
 		} else if (which == 2 || which == 3) {
 			createScene2704(which, 0x004B1828, 150);
 		} else {
@@ -555,8 +555,8 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3
 	_which2 = sceneInfo->which2;
 
 	_dataResource.load(sceneInfo->dataResourceFilename);
-	_pointList = _dataResource.getPointArray(sceneInfo->pointListName);
-	_class521->setPathPoints(_pointList);
+	_trackPoints = _dataResource.getPointArray(sceneInfo->pointListName);
+	_class521->setPathPoints(_trackPoints);
 	
 	if (sceneInfo->rectListName) {
 		_rectList = _dataResource.getRectArray(sceneInfo->rectListName);
@@ -564,14 +564,14 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3
 	}
 
 	if (which == _which2) {
-		NPoint testPoint = (*_pointList)[_pointList->size() - 1];
-		sendMessage(_class521, 0x2002, _pointList->size() - 1);
+		NPoint testPoint = (*_trackPoints)[_trackPoints->size() - 1];
+		sendMessage(_class521, 0x2002, _trackPoints->size() - 1);
 		if (testPoint.x > 0 && testPoint.x < 640 && testPoint.y > 0 && testPoint.y < 480)
 			sendMessage(_class521, 0x2009, 0);
 		else
 			sendMessage(_class521, 0x2007, 0);
 	} else {
-		NPoint testPoint = (*_pointList)[0];
+		NPoint testPoint = (*_trackPoints)[0];
 		sendMessage(_class521, 0x2002, 0);
 		if (testPoint.x > 0 && testPoint.x < 640 && testPoint.y > 0 && testPoint.y < 480)
 			sendMessage(_class521, 0x2009, 0);
@@ -581,6 +581,7 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3
 	
 	if (clipRect) {
 		_class521->getClipRect() = *clipRect;
+#if 0		
 		if (_class517)
 			_class517->getClipRect() = *clipRect; 
 		if (_class520)
@@ -588,7 +589,8 @@ Scene2704::Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint3
 		if (_class519)
 			_class519->getClipRect() = *clipRect; 
 		if (_class518)
-			_class518->getClipRect() = *clipRect; 
+			_class518->getClipRect() = *clipRect;
+#endif			 
 	}
 
 }
@@ -619,4 +621,126 @@ uint32 Scene2704::handleMessage(int messageNum, const MessageParam &param, Entit
 	return 0;
 }
 
+static const struct { const char *pointListName; int which1, which2; } kSceneInfo2706[] = {
+	{"me06slotSlotPath2", 4, -1},
+	{"me06slotSlotPath3", -1, 6},
+	{"me06slotSlotPath4", -1, 5}
+};
+
+Scene2706::Scene2706(NeverhoodEngine *vm, Module *parentModule, int which)
+	: Scene(vm, parentModule, true), _newTrackIndex(-1), _count(3) {
+	
+	_surfaceFlag = true;
+	SetMessageHandler(&Scene2706::handleMessage);
+	
+	setBackground(0x18808B88);
+	setPalette(0x18808B88);
+	
+	_palette->addPalette(calcHash("paPodShade"), 65, 31, 65);
+	_palette->addPalette(calcHash("paKlayShade"), 0, 65, 0);
+	
+	insertMouse433(0x08B8C180);
+
+//TODO	_class437 = insertSprite<Class437>(0x18808B88);
+	_class521 = insertSprite<Class521>(this, 320, 240);
+//TODO		_class517 = insertSprite<Class517>(_class521, _class437->getSurface(), 4);
+//TODO		_class518 = insertSprite<Class518>(_class521);
+//TODO		_class520 = insertSprite<Class520>(_class521, _class437->getSurface(), 4);
+//TODO		_class519 = insertSprite<Class519>(_class521, _class437->getSurface(), 4);
+
+	_dataResource.load(0x06000162);
+	
+	if (which == 5)
+		_currTrackIndex = 2;
+	else if (which == 6)		
+		_currTrackIndex = 1;
+	else
+		_currTrackIndex = 0;
+
+	_trackPoints = _dataResource.getPointArray(calcHash(kSceneInfo2706[_currTrackIndex].pointListName));
+	_class521->setPathPoints(_trackPoints);
+
+	if (which == kSceneInfo2706[_currTrackIndex].which2) {
+		sendMessage(_class521, 0x2002, _trackPoints->size() - 1);
+		if (which == 5)
+			sendMessage(_class521, 0x2007, 50);
+		else			
+			sendMessage(_class521, 0x2007, 150);
+	} else {
+		sendMessage(_class521, 0x2002, 0);
+		if (which == 5)
+			sendMessage(_class521, 0x2008, 50);
+		else			
+			sendMessage(_class521, 0x2008, 150);
+	}
+	
+}
+
+uint32 Scene2706::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+	Scene::handleMessage(messageNum, param, sender);
+	switch (messageNum) {
+	case 0x0001:
+		findClosestTrack(param.asPoint());
+		break;
+	case 0x2005:
+		if (_newTrackIndex >= 0) {
+			if (kSceneInfo2706[_currTrackIndex].which1 < 0)
+				changeTrack();
+		} else if (kSceneInfo2706[_currTrackIndex].which1 >= 0)
+			leaveScene(kSceneInfo2706[_currTrackIndex].which1);
+		break;
+	case 0x2006:
+		if (_newTrackIndex >= 0) {
+			if (kSceneInfo2706[_currTrackIndex].which2 < 0)
+				changeTrack();
+		} else if (kSceneInfo2706[_currTrackIndex].which2 >= 0)
+			leaveScene(kSceneInfo2706[_currTrackIndex].which2);
+		break;
+	case 0x200D:
+		sendMessage(_parentModule, 0x200D, 0);
+		break;
+	}
+	return 0;
+}
+
+void Scene2706::findClosestTrack(NPoint pt) {
+	int minMatchTrackIndex = -1;
+	int minMatchDistance = 640;
+	// Find the track which contains a point closest to pt
+	for (int infoIndex = 0; infoIndex < _count; infoIndex++) {
+		NPointArray *pointList = _dataResource.getPointArray(calcHash(kSceneInfo2706[infoIndex].pointListName));
+		for (uint pointIndex = 0; pointIndex < pointList->size(); pointIndex++) {
+			NPoint testPt = (*pointList)[pointIndex];
+			int distance = calcDistance(testPt.x, testPt.y, pt.x, pt.y);
+			if (distance < minMatchDistance) {
+				minMatchTrackIndex = infoIndex;
+				minMatchDistance = distance;
+			}
+		}
+	}
+	if (minMatchTrackIndex >= 0 && minMatchTrackIndex != _currTrackIndex) {
+		_newTrackIndex = minMatchTrackIndex;
+		_newTrackDestX = pt.x;
+		if (_currTrackIndex == 0)
+			sendMessage(_class521, 0x2003, _trackPoints->size() - 1);
+		else
+			sendMessage(_class521, 0x2003, 0);
+	} else {
+		_newTrackIndex = -1;
+		sendMessage(_class521, 0x2004, pt.x);
+	}
+}
+
+void Scene2706::changeTrack() {
+	_currTrackIndex = _newTrackIndex;
+	_trackPoints = _dataResource.getPointArray(calcHash(kSceneInfo2706[_currTrackIndex].pointListName));
+	_class521->setPathPoints(_trackPoints);
+	if (_currTrackIndex == 0)
+		sendMessage(_class521, 0x2002, _trackPoints->size() - 1);
+	else
+		sendMessage(_class521, 0x2002, 0);
+	sendMessage(_class521, 0x2004, _newTrackDestX);
+	_newTrackIndex = -1;
+}
+
 } // End of namespace Neverhood
diff --git a/engines/neverhood/module2700.h b/engines/neverhood/module2700.h
index 4df284c0f3..b596ccd580 100644
--- a/engines/neverhood/module2700.h
+++ b/engines/neverhood/module2700.h
@@ -60,12 +60,31 @@ public:
 protected:
 	Class521 *_class521;
 	int _which1, _which2;
-	NPointArray *_pointList;
+	NPointArray *_trackPoints;
 	NRectArray *_rectList;
 	void update();
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
 };
 
+class Scene2706 : public Scene {
+public:
+	Scene2706(NeverhoodEngine *vm, Module *parentModule, int which);
+protected:
+	Class521 *_class521;
+	Sprite *_class437;
+	Sprite *_class517;
+	Sprite *_class518;
+	Sprite *_class520;
+	Sprite *_class519;
+	int16 _newTrackDestX;
+	int _currTrackIndex, _newTrackIndex;
+	int _count;
+	NPointArray *_trackPoints;
+	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
+	void findClosestTrack(NPoint pt);
+	void changeTrack();
+};
+
 } // End of namespace Neverhood
 
 #endif /* NEVERHOOD_MODULE2700_H */