[Scummvm-cvs-logs] SF.net SVN: scummvm:[36297] scummvm/branches/branch-0-13-0/engines/agos/ agos.cpp

[Kirben at users.sourceforge.net]

Revision: 36297
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36297&view=rev
Author:   Kirben
Date:     2009-02-13 05:53:54 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Fix memory leaks in correct location, when exiting Waxworks. And remove unused shutdown() code.

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/agos/agos.cpp

Modified: scummvm/branches/branch-0-13-0/engines/agos/agos.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/agos/agos.cpp	2009-02-13 05:50:17 UTC (rev 36296)
+++ scummvm/branches/branch-0-13-0/engines/agos/agos.cpp	2009-02-13 05:53:54 UTC (rev 36297)
@@ -902,10 +902,14 @@
 	free(_gameOffsetsPtr);
 	free(_iconFilePtr);
 	free(_itemArrayPtr);
+	free(_menuBase);
+	free(_roomsList);
+	free(_roomStates);
 	free(_stringTabPtr);
 	free(_strippedTxtMem);
 	free(_tblList);
 	free(_textMem);
+	free(_xtblList);
 
 	free(_backGroundBuf);
 	free(_backBuf);
@@ -1025,60 +1029,6 @@
 }
 
 
-/*  I do not think that this will be used
- *
-void AGOSEngine::shutdown() {
-	// Sync with AGOSEngine::~AGOSEngine()
-	// In Simon 2, this gets deleted along with _sound further down
-	if (getGameType() != GType_SIMON2)
-		delete _gameFile;
-
-	_midi.close();
-	delete _driver;
-
-	for (uint i = 0; i < _itemHeap.size(); i++) {
-		delete[] _itemHeap[i];
-	}
-	_itemHeap.clear();
-
-	free(_tablesHeapPtr - _tablesHeapCurPos);
-
-	free(_gameOffsetsPtr);
-	free(_iconFilePtr);
-	free(_itemArrayPtr);
-	free(_roomsList);
-	free(_roomStates);
-	free(_stringTabPtr);
-	free(_strippedTxtMem);
-	free(_tblList);
-	free(_textMem);
-	free(_xtblList);
-
-	free(_backGroundBuf);
-	free(_backBuf);
-	free(_scaleBuf);
-
-	free(_window4BackScn);
-	free(_window6BackScn);
-
-	free(_variableArray);
-	free(_variableArray2);
-
-	delete _dummyItem1;
-	delete _dummyItem2;
-	delete _dummyItem3;
-
-	delete _dummyWindow;
-	delete[] _windowList;
-
-	delete _debugger;
-	delete _moviePlayer;
-	delete _sound;
-
-	_system->shouldQuit();
-}
-*/
-
 uint32 AGOSEngine::getTime() const {
 	return _system->getMillis() / 1000;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.