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

[Kirben at users.sourceforge.net]

Revision: 31380
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31380&view=rev
Author:   Kirben
Date:     2008-04-04 02:33:09 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
Revert revision 31256, since _textSurfaceMultiplier isn't set at that point.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=31256&view=rev

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:16:25 UTC (rev 31379)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-04-04 09:33:09 UTC (rev 31380)
@@ -528,11 +528,6 @@
 	else
 		_compositeBuf = 0;
 
-	_fmtownsBuf = 0;
-	if (_game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) {
-		_fmtownsBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
-	}
-
 	_herculesBuf = 0;
 	if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 		_herculesBuf = (byte *)malloc(Common::kHercW * Common::kHercH);
@@ -1203,6 +1198,11 @@
 	Graphics::initfonts();
 #endif
 
+	_fmtownsBuf = 0;
+	if (_game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) {
+		_fmtownsBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
+	}
+
 	free(_compositeBuf);
 	_compositeBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
 }


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