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

[fingolfin at users.sourceforge.net]

Revision: 23933
          http://svn.sourceforge.net/scummvm/?rev=23933&view=rev
Author:   fingolfin
Date:     2006-09-18 12:58:22 -0700 (Mon, 18 Sep 2006)

Log Message:
-----------
Oops, accidentally broke TMSK support for HE 72+ games

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

Modified: scummvm/trunk/engines/scumm/gfx.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx.cpp	2006-09-18 19:22:40 UTC (rev 23932)
+++ scummvm/trunk/engines/scumm/gfx.cpp	2006-09-18 19:58:22 UTC (rev 23933)
@@ -1554,7 +1554,7 @@
 		if (_vm->_game.version == 8 || _vm->_game.heversion >= 60)
 			transpStrip = true;
 		
-		decodeMask(x, y, width, height, stripnr, numzbuf, zplane_list, transpStrip, flag);
+		decodeMask(x, y, width, height, stripnr, numzbuf, zplane_list, transpStrip, flag, tmsk_ptr);
 
 #if 0
 		// HACK: blit mask(s) onto normal screen. Useful to debug masking
@@ -1626,13 +1626,11 @@
 
 void Gdi::decodeMask(int x, int y, const int width, const int height,
 	                int stripnr, int numzbuf, const byte *zplane_list[9],
-	                bool transpStrip, byte flag) {
+	                bool transpStrip, byte flag, const byte *tmsk_ptr) {
 	int i;
 	byte *mask_ptr;
 	const byte *z_plane_ptr;
 
-	const byte *tmsk_ptr = NULL;	// FIXME
-
 	if (_vm->_game.version <= 1) {
 		mask_ptr = getMaskBuffer(x, y, 1);
 		if (_vm->_game.platform == Common::kPlatformNES) {

Modified: scummvm/trunk/engines/scumm/gfx.h
===================================================================
--- scummvm/trunk/engines/scumm/gfx.h	2006-09-18 19:22:40 UTC (rev 23932)
+++ scummvm/trunk/engines/scumm/gfx.h	2006-09-18 19:58:22 UTC (rev 23933)
@@ -273,7 +273,7 @@
 
 	virtual void decodeMask(int x, int y, const int width, const int height,
 	                int stripnr, int numzbuf, const byte *zplane_list[9],
-	                bool transpStrip, byte flag);
+	                bool transpStrip, byte flag, const byte *tmsk_ptr);
 
 public:
 	void init();


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