FULLPIPE: Further work on sceneSwitcher.

Reduced header dependency.
Put CGameLoader into separate files.

1 files changed, 6 insertions, 50 deletions

diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index 6afab022f9..57f96b76c0 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -24,14 +24,11 @@
 #define FULLPIPE_OBJECTS_H
 
 #include "fullpipe/utils.h"
-#include "fullpipe/inventory.h"
-#include "fullpipe/gfx.h"
-#include "fullpipe/sound.h"
-#include "fullpipe/scene.h"
 
 namespace Fullpipe {
 
 class MessageQueue;
+class SceneTagList;
 
 class GameProject : public CObject {
  public:
@@ -124,11 +121,11 @@ struct PicAniInfo {
 };
 
 struct EntranceInfo {
-	int32 sceneId;
-	int32 field_4;
-	int32 messageQueueId;
-	byte gap_C[292]; // FIXME
-	int32 field_130;
+	int32 _sceneId;
+	int32 _field_4;
+	int32 _messageQueueId;
+	byte _gap_C[292]; // FIXME
+	int32 _field_130;
 
 	bool load(MfcArchive &file);
 };
@@ -232,47 +229,6 @@ class PreloadItems : public Common::Array<PreloadItem>, public CObject {
 	virtual bool load(MfcArchive &file);
 };
 
-class CGameLoader : public CObject {
- public:
-	CGameLoader();
-	virtual ~CGameLoader();
-
-	virtual bool load(MfcArchive &file);
-	bool loadScene(int num);
-
-	int getSceneTagBySceneId(int num, SceneTag **st);
-	void applyPicAniInfos(Scene *sc, PicAniInfo **picAniInfo, int picAniInfoCount);
-
-	CGameVar *_gameVar;
-	CInventory2 _inventory;
-
- private:
-	GameProject *_gameProject;
-	CInteractionController *_interactionController;
-	int _field_C;
-	int _field_10;
-	int _field_14;
-	int _field_18;
-	int _field_1C;
-	int _field_20;
-	int _field_24;
-	int _field_28;
-	int _field_2C;
-	CInputController _inputController;
-	Sc2Array _sc2array;
-	void *_sceneSwitcher;
-	void *_preloadCallback;
-	void *_readSavegameCallback;
-	int16 _field_F8;
-	int16 _field_FA;
-	PreloadItems _preloadItems;
-	char *_gameName;
-	ExCommand _exCommand;
-	int _updateCounter;
-	int _preloadId1;
-	int _preloadId2;
-};
-
 class CObjstateCommand : public CObject {
 	ExCommand _cmd;
 	char *_objCommandName;