[Scummvm-cvs-logs] scummvm master -> 96065c7f876f6e75f4b739b5cab894246edba5b7

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
de01a09141 FULLPIPE: Removed unused code
96065c7f87 FULLPIPE: Implement GameLoader::~GameLoader()


Commit: de01a09141d820e765b33a801d295dc18243851b
    https://github.com/scummvm/scummvm/commit/de01a09141d820e765b33a801d295dc18243851b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-13T10:32:35+03:00

Commit Message:
FULLPIPE: Removed unused code

Changed paths:
    engines/fullpipe/fullpipe.cpp



diff --git a/engines/fullpipe/fullpipe.cpp b/engines/fullpipe/fullpipe.cpp
index f4444ef..501313c 100644
--- a/engines/fullpipe/fullpipe.cpp
+++ b/engines/fullpipe/fullpipe.cpp
@@ -413,13 +413,10 @@ void FullpipeEngine::updateEvents() {
 		}
 	}
 
-		
-#if 0
-	warning("STUB: FullpipeEngine::updateEvents() <mainWindowProc>");
-	if (Msg == MSG_SC11_SHOWSWING && _modalObject) {
-		_modalObject->method14();
-	}
-#endif
+	// pollEvent() is implemented only for video player. So skip it.
+	//if (event.kbd.keycode == MSG_SC11_SHOWSWING && _modalObject) {
+	//	_modalObject->pollEvent();
+	//}
 }
 
 void FullpipeEngine::freeGameLoader() {


Commit: 96065c7f876f6e75f4b739b5cab894246edba5b7
    https://github.com/scummvm/scummvm/commit/96065c7f876f6e75f4b739b5cab894246edba5b7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-06-13T10:32:35+03:00

Commit Message:
FULLPIPE: Implement GameLoader::~GameLoader()

Changed paths:
    engines/fullpipe/gameloader.cpp



diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index 0599295..25cda53 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -84,7 +84,34 @@ GameLoader::~GameLoader() {
 	delete _interactionController;
 	delete _inputController;
 
-	warning("STUB: GameLoader::~GameLoader()");
+	g_fp->_gameLoader = 0;
+
+	for (uint i = 0; i < _sc2array.size(); i++) {
+		if (_sc2array[i]._defPicAniInfos)
+			delete _sc2array[i]._defPicAniInfos;
+
+		if (_sc2array[i]._picAniInfos)
+			delete _sc2array[i]._picAniInfos;
+
+		if (_sc2array[i]._motionController)
+			delete _sc2array[i]._motionController;
+
+		if (_sc2array[i]._data1)
+			free(_sc2array[i]._data1);
+
+		if (_sc2array[i]._entranceData)
+			free(_sc2array[i]._entranceData);
+	}
+
+	delete _gameVar;
+	_gameVar = 0;
+
+	if (g_fp->_globalPalette) {
+		free(g_fp->_globalPalette);
+		g_fp->_globalPalette = 0;
+	}
+
+	_sc2array.clear();
 }
 
 bool GameLoader::load(MfcArchive &file) {