NEVERHOOD: Clean up Module2700 (like the ones before)

- Add Scene2703 and Scene2732

1 files changed, 26 insertions, 3 deletions

diff --git a/engines/neverhood/module2700.h b/engines/neverhood/module2700.h
index 4973211075..d17d12cfc5 100644
--- a/engines/neverhood/module2700.h
+++ b/engines/neverhood/module2700.h
@@ -37,15 +37,15 @@ public:
 	Module2700(NeverhoodEngine *vm, Module *parentModule, int which);
 	virtual ~Module2700();
 protected:
+	int _sceneNum;
 	int _soundIndex;
 	bool _raidoMusicInitialized;
 	uint32 _scene2711StaticSprites[6];
 	uint32 _musicFileHash;
 	void createScene(int sceneNum, int which);
 	void updateScene();
-	void update();
 	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
-	void createScene2703(int which, uint32 sceneInfoId, const uint32 *staticSprites = NULL, const NRect *clipRect = NULL);
+	void createScene2703(int which, uint32 sceneInfoId);
 	void createScene2704(int which, uint32 sceneInfoId, int16 value, const uint32 *staticSprites = NULL, const NRect *clipRect = NULL);
 };
 
@@ -110,7 +110,7 @@ protected:
 	int16 _newTrackDestX;
 	int _currTrackIndex, _newTrackIndex;
 	int _count;
-	bool _flag1;
+	bool _isInLight;
 	SceneInfo2700 *_sceneInfos[2][3];
 	SceneInfo2700 **_currSceneInfos;
 	NPointArray *_trackPoints;
@@ -120,6 +120,24 @@ protected:
 	void changeTrack();
 };
 
+class Scene2703 : public Scene {
+public:
+	Scene2703(NeverhoodEngine *vm, Module *parentModule, int which, uint32 sceneInfoId);
+protected:
+	AsCommonCar *_asCar;
+	Sprite *_ssTrackShadowBackground;
+	Sprite *_asCarShadow;
+	Sprite *_asCarConnector;
+	Sprite *_asCarTrackShadow;
+	Sprite *_asCarConnectorShadow;
+	int _palStatus;
+	int _which1, _which2;
+	NPointArray *_trackPoints;
+	NRectArray *_rectList;
+	void update();
+	uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);
+};
+
 class Scene2704 : public Scene {
 public:
 	Scene2704(NeverhoodEngine *vm, Module *parentModule, int which, uint32 sceneInfoId, int16 value,
@@ -156,6 +174,11 @@ protected:
 	void changeTrack();
 };
 
+class Scene2732 : public Scene {
+public:
+	Scene2732(NeverhoodEngine *vm, Module *parentModule);
+};
+
 } // End of namespace Neverhood
 
 #endif /* NEVERHOOD_MODULE2700_H */