FULLPIPE: More work on Sc2 loader

2 files changed, 37 insertions, 2 deletions

diff --git a/engines/fullpipe/objects.h b/engines/fullpipe/objects.h
index a974852dba..069d25d125 100644
--- a/engines/fullpipe/objects.h
+++ b/engines/fullpipe/objects.h
@@ -176,11 +176,20 @@ class CInputController {
 	CInputController();
 };
 
+class CMotionController : public CObject {
+	int _field_4;
+	int _isEnabled;
+
+ public:
+	CMotionController() : _isEnabled(1) {}
+	virtual bool load(MfcArchive &file);
+};
+
 class Sc2 : public CObject {
 	int16 _sceneId;
 	int16 _field_2;
 	//Scene *_scene;
-	//CMotionController *_motionController;
+	CMotionController *_motionController;
 	int _data1;
 	int _count1;
 	int _defPicAniInfos;
@@ -192,6 +201,7 @@ class Sc2 : public CObject {
 	int _entranceDataCount;
 
  public:
+	Sc2();
 	virtual bool load(MfcArchive &file);
 };
 
@@ -396,7 +406,6 @@ class CGameLoader : public CObject {
 	virtual bool load(MfcArchive &file);
 
  private:
-	//CObject _obj;
 	GameProject *_gameProject;
 	CInteractionController *_interactionController;
 	int _field_C;
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 4602cee487..ea8a3dbe2d 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -480,9 +480,35 @@ bool CGameVar::load(MfcArchive &file) {
 	return true;
 }
 
+Sc2::Sc2() {
+	_sceneId = 0;
+	_field_2 = 0;
+	//_scene = 0;
+	_motionController = 0;
+	_data1 = 0;
+	_count1 = 0;
+	_defPicAniInfos = 0;
+	_defPicAniInfosCount = 0;
+	_picAniInfos = 0;
+	_picAniInfosCount = 0;
+	_isLoaded = 0;
+	_entranceData = 0;
+	_entranceDataCount = 0;
+}
+
 bool Sc2::load(MfcArchive &file) {
 	_sceneId = file.readUint16LE();
 
+	file.readClass();
+	_motionController->load(file);
+
+	return true;
+}
+
+
+bool CMotionController::load(MfcArchive &file) {
+	// Is originally empty
+
 	return true;
 }