FULLPIPE: Further work on sceneSwitcher.

Reduced header dependency.
Put CGameLoader into separate files.

1 files changed, 17 insertions, 6 deletions

diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index 31f44fda76..6a10f231ee 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -44,13 +44,15 @@ enum FullpipeGameFeatures {
 };
 
 class CGameLoader;
-class GameProject;
 class CGameVar;
 class CInventory2;
-class Scene;
+class EntranceInfo;
+class GameProject;
+class GlobalMessageQueueList;
 class NGIArchive;
+class Scene;
+class SoundList;
 class StaticANIObject;
-class GlobalMessageQueueList;
 
 class FullpipeEngine : public ::Engine {
 protected:
@@ -86,14 +88,21 @@ public:
 	int _gameProjectVersion;
 	int _pictureScale;
 	int _scrollSpeed;
-	int _currSoundListCount;
-	bool _soundEnabled;
-	bool _flgSoundList;
+	bool _savesEnabled;
+	bool _updateFlag;
+	bool _flgCanOpenMap;
 
 	Common::Rect _sceneRect;
+	int _sceneWidth;
+	int _sceneHeight;
 	Scene *_scene2;
 	StaticANIObject *_aniMan;
 
+	SoundList *_currSoundList1[11];
+	int _currSoundListCount;
+	bool _soundEnabled;
+	bool _flgSoundList;
+
 	GlobalMessageQueueList *_globalMessageQueueList;
 
 	bool _needQuit;
@@ -106,11 +115,13 @@ public:
 	CGameVar *_swallowedEgg2;
 	CGameVar *_swallowedEgg3;
 
+	Scene *_inventoryScene;
 	CInventory2 *_inventory;
 
 	void setObjectState(const char *name, int state);
 	int getObjectEnumState(const char *name, const char *state);
 
+	bool sceneSwitcher(EntranceInfo *entrance);
 	Scene *accessScene(int sceneId);
 
 	NGIArchive *_currArchive;