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

[athrxx at users.sourceforge.net]

Revision: 53113
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53113&view=rev
Author:   athrxx
Date:     2010-10-10 10:26:49 +0000 (Sun, 10 Oct 2010)

Log Message:
-----------
LOOM PC-Engine: fix regression

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/charset.cpp
    scummvm/trunk/engines/scumm/player_towns.cpp
    scummvm/trunk/engines/scumm/script_v5.cpp

Modified: scummvm/trunk/engines/scumm/charset.cpp
===================================================================
--- scummvm/trunk/engines/scumm/charset.cpp	2010-10-10 10:11:33 UTC (rev 53112)
+++ scummvm/trunk/engines/scumm/charset.cpp	2010-10-10 10:26:49 UTC (rev 53113)
@@ -1014,11 +1014,11 @@
 	} else {
 		Graphics::Surface dstSurface;
 		Graphics::Surface backSurface;
-		if (
+		if ((ignoreCharsetMask || !vs->hasTwoBuffers)
 #ifndef DISABLE_TOWNS_DUAL_LAYER_MODE
-			_vm->_game.platform != Common::kPlatformFMTowns && 
+			&& (_vm->_game.platform != Common::kPlatformFMTowns) 
 #endif
-			(ignoreCharsetMask || !vs->hasTwoBuffers) && !(_vm->_useCJKMode && _vm->_textSurfaceMultiplier == 2)) {
+			) {
 			dstSurface = *vs;
 			dstPtr = vs->getPixels(_left, drawTop);
 		} else {

Modified: scummvm/trunk/engines/scumm/player_towns.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_towns.cpp	2010-10-10 10:11:33 UTC (rev 53112)
+++ scummvm/trunk/engines/scumm/player_towns.cpp	2010-10-10 10:26:49 UTC (rev 53113)
@@ -628,17 +628,14 @@
 		uint8 pan = _soundOverride[sound].pan ? _soundOverride[sound].pan - 1 : 64;
 		uint8 pri = ptr[9];
 		_soundOverride[sound].velo = _soundOverride[sound].pan = 0;
-
 		playPcmTrack(sound, ptr + 8, velo, pan, ptr[52], pri);
 
 	} else if (READ_BE_UINT32(ptr) == MKID_BE('SBL ')) {
 		_soundOverride[sound].type = 5;
-
 		playVocTrack(ptr + 27);
 
 	} else {
 		_soundOverride[sound].type = 3;
-
 		_imuse->startSound(sound);
 	}
 }

Modified: scummvm/trunk/engines/scumm/script_v5.cpp
===================================================================
--- scummvm/trunk/engines/scumm/script_v5.cpp	2010-10-10 10:11:33 UTC (rev 53112)
+++ scummvm/trunk/engines/scumm/script_v5.cpp	2010-10-10 10:26:49 UTC (rev 53113)
@@ -1617,7 +1617,7 @@
 
 void ScummEngine_v5::o5_roomOps() {
 	int a = 0, b = 0, c, d, e;
-	const bool paramsBeforeOpcode = (_game.version == 3 && (_game.platform != Common::kPlatformPCEngine || _game.platform != Common::kPlatformFMTowns));
+	const bool paramsBeforeOpcode = ((_game.version == 3) && (_game.platform != Common::kPlatformPCEngine));
 
 	if (paramsBeforeOpcode) {
 		a = getVarOrDirectWord(PARAM_1);


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