1 files changed, 22 insertions, 6 deletions

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 2140b15544..e54060c9e1 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -480,7 +480,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		_renderMode = Common::kRenderDefault;
 	}
 
-	// Do some render mode restirctions
+	// Check some render mode restrictions
 	if (_game.version <= 1)
 		_renderMode = Common::kRenderDefault;
 
@@ -521,7 +521,11 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
 		_screenHeight = 200;
 	}
 
-	_compositeBuf = (byte *)malloc(_screenWidth * _screenHeight);
+	// Allocate gfx compositing buffer (not needed for V7/V8 games).
+	if (_game.version < 7)
+		_compositeBuf = (byte *)malloc(_screenWidth * _screenHeight);
+	else
+		_compositeBuf = 0;
 
 	_herculesBuf = 0;
 	if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
@@ -583,6 +587,7 @@ ScummEngine::~ScummEngine() {
 
 	free(_compositeBuf);
 	free(_herculesBuf);
+	free(_fmtownsBuf);
 
 	delete _debugger;
 	
@@ -1074,12 +1079,19 @@ int ScummEngine::init() {
 		_fileHandle = new ScummFile();
 	}
 	
+	// Load CJK font, if present
+	// Load it earlier so _useCJKMode variable could be set
+	loadCJKFont();
+
 	// Initialize backend
 	_system->beginGFXTransaction();
 		bool defaultTo1XScaler = false;
 		if (_renderMode == Common::kRenderHercA || _renderMode == Common::kRenderHercG) {
 			_system->initSize(Common::kHercW, Common::kHercH);
 			defaultTo1XScaler = true;
+		} else if (_useCJKMode) {
+			_system->initSize(_screenWidth * _textSurfaceMultiplier, _screenHeight * _textSurfaceMultiplier);
+			defaultTo1XScaler = true;
 		} else {
 			_system->initSize(_screenWidth, _screenHeight);
 			defaultTo1XScaler = (_screenWidth > 320);
@@ -1131,14 +1143,11 @@ void ScummEngine::setupScumm() {
 	// Load localization data, if present
 	loadLanguageBundle();
 
-	// Load CJK font, if present
-	loadCJKFont();
-
 	// Create the charset renderer
 	setupCharsetRenderer();
 
 	// Create and clear the text surface
-	_textSurface.create(_screenWidth, _screenHeight, 1);
+	_textSurface.create(_screenWidth * _textSurfaceMultiplier, _screenHeight * _textSurfaceMultiplier, 1);
 	clearTextSurface();
 
 	// Create the costume renderer
@@ -1206,6 +1215,13 @@ void ScummEngine::setupScumm() {
 #if (defined(PALMOS_ARM) || defined(PALMOS_DEBUG) || defined(__GP32__))
 	Graphics::initfonts();
 #endif
+
+	_fmtownsBuf = 0;
+	if (_game.platform == Common::kPlatformFMTowns && _language == Common::JA_JPN) {
+		_fmtownsBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
+	}
+
+	_compositeBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier);
 }
 
 #ifndef DISABLE_SCUMM_7_8