[Scummvm-cvs-logs] SF.net SVN: scummvm: [31381] scummvm/trunk/engines/scumm/scumm.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Apr 4 13:43:27 CEST 2008


Revision: 31381
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31381&view=rev
Author:   fingolfin
Date:     2008-04-04 04:43:26 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Properly *init* the _fmtownsBuf variable, and properly release the memory it points to when restarting

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2008-04-04 09:33:09 UTC (rev 31380)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-04-04 11:43:26 UTC (rev 31381)
@@ -528,6 +528,8 @@
 	else
 		_compositeBuf = 0;
 
+	_fmtownsBuf = 0;
+
 	_herculesBuf = 0;
 	if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 		_herculesBuf = (byte *)malloc(Common::kHercW * Common::kHercH);
@@ -1198,8 +1200,8 @@
 	Graphics::initfonts();
 #endif
 
-	_fmtownsBuf = 0;
 	if (_game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) {
+		free(_fmtownsBuf);
 		_fmtownsBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
 	}
 


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




More information about the Scummvm-git-logs mailing list