[Scummvm-cvs-logs] SF.net SVN: scummvm: [22129] scummvm/trunk/engines/simon

[kirben at users.sourceforge.net]

Revision: 22129
Author:   kirben
Date:     2006-04-23 19:11:04 -0700 (Sun, 23 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22129&view=rev

Log Message:
-----------
Free screen buffers on exit

Modified Paths:
--------------
    scummvm/trunk/engines/simon/simon.cpp
    scummvm/trunk/engines/simon/simon.h
Modified: scummvm/trunk/engines/simon/simon.cpp
===================================================================
--- scummvm/trunk/engines/simon/simon.cpp	2006-04-24 01:40:16 UTC (rev 22128)
+++ scummvm/trunk/engines/simon/simon.cpp	2006-04-24 02:11:04 UTC (rev 22129)
@@ -377,7 +377,7 @@
 	_backGroundBuf = 0;
 	_frontBuf = 0;
 	_backBuf = 0;
-	_sdl_buf_scaled = 0;
+	_scaleBuf = 0;
 
 	_vc10BasePtrOld = 0;
 	memcpy (_hebrewCharWidths,
@@ -571,14 +571,21 @@
 
 	midi.close();
 
-	free(_stringTabPtr);
-	free(_itemArrayPtr);
 	free(_itemHeapPtr - _itemHeapCurPos);
 	free(_tablesHeapPtr - _tablesHeapCurPos);
+
+	free(_gameOffsetsPtr);
+	free(_iconFilePtr);
+	free(_itemArrayPtr);
+	free(_stringTabPtr);
+	free(_strippedTxtMem);
 	free(_tblList);
-	free(_iconFilePtr);
-	free(_gameOffsetsPtr);
 
+	free(_backGroundBuf);
+	free(_frontBuf);
+	free(_backBuf);
+	free(_scaleBuf);
+
 	delete _dummyItem1;
 	delete _dummyItem2;
 	delete _dummyItem3;
@@ -3501,7 +3508,7 @@
 	_frontBuf = (byte *)calloc(_screenWidth * _screenHeight, 1);
 	_backBuf = (byte *)calloc(_screenWidth * _screenHeight, 1);
 	if (getGameType() == GType_FF)
-		_sdl_buf_scaled = (byte *)calloc(_screenWidth * _screenHeight, 1);
+		_scaleBuf = (byte *)calloc(_screenWidth * _screenHeight, 1);
 
 	allocItemHeap();
 	allocTablesHeap();
@@ -3771,7 +3778,7 @@
 
 byte *SimonEngine::getScaleBuf() {
 	_dxSurfacePitch = _screenWidth;
-	return _sdl_buf_scaled;
+	return _scaleBuf;
 }
 
 void SimonEngine::set_volume(int volume) {

Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h	2006-04-24 01:40:16 UTC (rev 22128)
+++ scummvm/trunk/engines/simon/simon.h	2006-04-24 02:11:04 UTC (rev 22129)
@@ -468,7 +468,7 @@
 	byte *_backGroundBuf;
 	byte *_frontBuf;
 	byte *_backBuf;
-	byte *_sdl_buf_scaled;
+	byte *_scaleBuf;
 
 	Common::RandomSource _rnd;
 


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