FULLPIPE: Moved global variables to fullpipe.cpp

scummvm · Sep 6, 2013 · 4eb9176 · 4eb9176
1 parent 146e5a9
commit 4eb9176
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
@@ -32,6 +32,10 @@
 
 namespace Fullpipe {
 
+int g_gameProjectVersion = 0;
+int g_gameProjectValue = 0;
+int g_scrollSpeed = 0;
+
 FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
 	// Setup mixer
 	if (!_mixer->isReady()) {

diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
@@ -45,6 +45,11 @@ enum FullpipeGameFeatures {
 
 class CGameLoader;
 
+extern int g_gameProjectVersion;
+extern int g_gameProjectValue;
+extern int g_scrollSpeed;
+
+
 class FullpipeEngine : public ::Engine {
 protected:
 

diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
@@ -48,39 +48,47 @@ bool CGameLoader::loadFile(const char *fname) {
 		return false;
 
 	_gameName = file.readPascalString();
+	debug(0, "_gameName: %s", _gameName);
 
 	_gameProject = new GameProject(file);
 
+	if (g_gameProjectVersion < 12) {
+		error("Old gameProjectVersion: %d", g_gameProjectVersion);
+	}
+
+	_gameName = file.readPascalString();
+	debug(0, "_gameName: %s", _gameName);
+
 	return true;
 }
 
 CGameLoader::~CGameLoader() {
 	free(_gameName);
+	delete _gameProject;
 }
 
 GameProject::GameProject(CFile &file) {
 	_field_4 = 0;
 	_headerFilename = 0;
 	_field_10 = 12;
 
-	// FIXME
-	int _gameProjectVersion = file.readUint32LE();
-	int _gameProjectValue = file.readUint16LE();
-	int _scrollSpeed = file.readUint32LE();
+	g_gameProjectVersion = file.readUint32LE();
+	g_gameProjectValue = file.readUint16LE();
+	g_scrollSpeed = file.readUint32LE();
 
 	_headerFilename = file.readPascalString();
 
-	_sceneTagList = new SceneTagList(file);
-
-	debug(0, "_gameProjectVersion = %d", _gameProjectVersion);
-	debug(0, "_gameProjectValue = %d", _gameProjectValue);
-	debug(0, "_scrollSpeed = %d", _scrollSpeed);
+	debug(0, "_gameProjectVersion = %d", g_gameProjectVersion);
+	debug(0, "_gameProjectValue = %d", g_gameProjectValue);
+	debug(0, "_scrollSpeed = %d", g_scrollSpeed);
 	debug(0, "_headerFilename = %s", _headerFilename);
 
-	if (_gameProjectVersion >= 3)
+	_sceneTagList = new SceneTagList(file);
+
+	if (g_gameProjectVersion >= 3)
 		_field_4 = file.readUint32LE();
 
-	if (_gameProjectVersion >= 5) {
+	if (g_gameProjectVersion >= 5) {
 		file.readUint32LE();
 		file.readUint32LE();
 	}