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

[athrxx at users.sourceforge.net]

Revision: 52987
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52987&view=rev
Author:   athrxx
Date:     2010-10-02 23:18:15 +0000 (Sat, 02 Oct 2010)

Log Message:
-----------
INDY3/FM-TOWNS: fix intro graphics bug

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

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2010-10-02 23:17:19 UTC (rev 52986)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2010-10-02 23:18:15 UTC (rev 52987)
@@ -326,7 +326,7 @@
 		if (!_townsClearLayerFlag && (h - b != _virtscr[kMainVirtScreen].h))
 			_townsScreen->clearLayer(0);
 
-		if (_game.id == GID_MONKEY2 || _game.id == GID_INDY4) {
+		if (_game.id != GID_MONKEY) {
 			_textSurface.fillRect(Common::Rect(0, 0, _textSurface.w * _textSurfaceMultiplier, _textSurface.h * _textSurfaceMultiplier), 0);
 			_townsScreen->clearLayer(1);
 		}
@@ -3678,18 +3678,17 @@
 	if (_game.version < 7)
 		camera._last.x = camera._cur.x;
 
+	if (_game.version == 3 && _game.platform == Common::kPlatformFMTowns)
+		_textSurface.fillRect(Common::Rect(0, vs->topline * _textSurfaceMultiplier, _textSurface.pitch, (vs->topline + vs->h) * _textSurfaceMultiplier), 0);
+
 	// TheDig can disable fadeIn(), and may call fadeOut() several times
 	// successively. Disabling the _screenEffectFlag check forces the screen
 	// to get cleared. This fixes glitches, at least, in the first cutscenes
 	// when bypassed of FT and TheDig.
 	if ((_game.version == 7 || _screenEffectFlag) && effect != 0) {
-
 		// Fill screen 0 with black
 		memset(vs->getPixels(0, 0), 0, vs->pitch * vs->h);
 
-		if (_game.version == 3 && _game.platform == Common::kPlatformFMTowns)
-			_textSurface.fillRect(Common::Rect(0, vs->topline * _textSurfaceMultiplier, _textSurface.pitch, (vs->topline + vs->h) * _textSurfaceMultiplier), 0);
-
 		// Fade to black with the specified effect, if any.
 		switch (effect) {
 		case 1:

Modified: scummvm/trunk/engines/scumm/gfx_towns.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx_towns.cpp	2010-10-02 23:17:19 UTC (rev 52986)
+++ scummvm/trunk/engines/scumm/gfx_towns.cpp	2010-10-02 23:18:15 UTC (rev 52987)
@@ -49,7 +49,7 @@
 	int sp1 = vs->pitch - (width * vs->bytesPerPixel);
 	int sp2 = _textSurface.pitch - width * m;
 				
-	if (vs->number == kMainVirtScreen) {
+	if (vs->number == kMainVirtScreen || _game.id == GID_INDY3 || _game.id == GID_ZAK) {
 		for (int h = 0; h < height; ++h) {
 			if (_bytesPerPixelOutput == 2) {
 				for (int w = 0; w < width; ++w) {


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