[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.44,1.45

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9424

Modified Files:
	gfx.cpp 
Log Message:
Fixed a few graphic glitchs in zak256

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** gfx.cpp	9 Mar 2002 00:59:29 -0000	1.44
--- gfx.cpp	9 Mar 2002 09:15:34 -0000	1.45
***************
*** 1218,1225 ****
--- 1218,1256 ----
  }
  
+ /* Ender - Zak256/Indy256 decoders */
+ #define READ_256BIT \
+  if ((mask <<= 1) == 256) {buffer = *src++;  mask = 1;}     \
+  bits = ((buffer & mask) != 0);
+ 
+ #define NEXT_ROW                                               \
+                 dst += 320;                                     \
+                 if (--h == 0) {                                 \
+                         if (!--_currentX)                       \
+                                 return;                         \
+                         dst -= _vertStripNextInc;               \
+                         h = _numLinesToProcess;                 \
+                 }
+ 
  void Gdi::unkDecode7() {
  	byte *src = _smap_ptr;
  	byte *dst = _bgbak_ptr;
  	int height = _numLinesToProcess;
+ 	uint h = _numLinesToProcess;
+ 	
+ 	
+ 	if(_vm->_features & GF_OLD256)
+ 	{
+        		_currentX = 8;
+        		for(;;) {
+ 
+         		byte color = *src++;
+         
+    
+              			*dst = color;
+ 				NEXT_ROW
+ 		}
+        		return;
+ 	}
+ 	
  	do {
  		/* Endian safe */
***************
*** 1234,1251 ****
  	} while (--height);
  }
- 
- /* Ender - Zak256/Indy256 decoders */
- #define READ_256BIT \
-  if ((mask <<= 1) == 256) {buffer = *src++;  mask = 1;}     \
-  bits = ((buffer & mask) != 0);
- 
- #define NEXT_ROW                                               \
-                 dst += 320;                                     \
-                 if (--h == 0) {                                 \
-                         if (!--_currentX)                       \
-                                 return;                         \
-                         dst -= _vertStripNextInc;               \
-                         h = _numLinesToProcess;                 \
-                 }
  
  void Gdi::unkDecode8() {
--- 1265,1268 ----