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

[fingolfin at users.sourceforge.net]

Revision: 34643
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34643&view=rev
Author:   fingolfin
Date:     2008-09-24 20:31:14 +0000 (Wed, 24 Sep 2008)

Log Message:
-----------
cleanup

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

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2008-09-24 20:29:29 UTC (rev 34642)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2008-09-24 20:31:14 UTC (rev 34643)
@@ -22,7 +22,6 @@
  *
  */
 
-
 #include "common/system.h"
 #include "scumm/scumm.h"
 #include "scumm/actor.h"
@@ -577,23 +576,19 @@
 
 	const byte *src = vs->getPixels(x, top);
 	int m = _textSurfaceMultiplier;
-	byte *dst;
 	int vsPitch;
 	int pitch = vs->pitch;
 
 	if (_useCJKMode && _textSurfaceMultiplier == 2) {
-		dst = _fmtownsBuf;
+		scale2x(_fmtownsBuf, _screenWidth * m, src, vs->pitch,  width, height);
+		src = _fmtownsBuf;
 
-		scale2x(dst, _screenWidth * m, src, vs->pitch,  width, height);
-		src = dst;
-
 		vsPitch = _screenWidth * m - width * m;
 
 	} else {
 		vsPitch = vs->pitch - width;
 	}
 
-	dst = _compositeBuf;
 
 	if (_game.version < 7) {
 		// For The Dig, FT and COMI, we just blit everything to the screen at once.
@@ -613,12 +608,12 @@
 
 		// Compose the text over the game graphics
 #ifdef USE_ARM_GFX_ASM
-		asmDrawStripToScreen(height, width, text, src, dst, vs->pitch, width, _textSurface.pitch);
+		asmDrawStripToScreen(height, width, text, src, _compositeBuf, vs->pitch, width, _textSurface.pitch);
 #else
 		// We blit four pixels at a time, for improved performance.
 		const uint32 *src32 = (const uint32 *)src;
 		const uint32 *text32 = (const uint32 *)text;
-		uint32 *dst32 = (uint32 *)dst;
+		uint32 *dst32 = (uint32 *)_compositeBuf;
 		
 		vsPitch >>= 2;
 		const int textPitch = (_textSurface.pitch - width * m) >> 2;


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