diff options
author | Travis Howell | 2008-04-04 09:33:09 +0000 |
---|---|---|
committer | Travis Howell | 2008-04-04 09:33:09 +0000 |
commit | e36b95b64a0a830f94eed17687cbc078fde05c22 (patch) | |
tree | 4f44a86e5e617a9672bcbacde093535272fcf377 /engines | |
parent | 05e2b6696730fe0abb177d57725dd0db7ff12085 (diff) | |
download | scummvm-rg350-e36b95b64a0a830f94eed17687cbc078fde05c22.tar.gz scummvm-rg350-e36b95b64a0a830f94eed17687cbc078fde05c22.tar.bz2 scummvm-rg350-e36b95b64a0a830f94eed17687cbc078fde05c22.zip |
Revert revision 31256, since _textSurfaceMultiplier isn't set at that point.
svn-id: r31380
Diffstat (limited to 'engines')
-rw-r--r-- | engines/scumm/scumm.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index d2e8404d66..3a93fae0fa 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -528,11 +528,6 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) 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 @@ void ScummEngine::setupScumm() { 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); } |