[Scummvm-cvs-logs] SF.net SVN: scummvm: [29423] scummvm/trunk/engines/cruise/dataLoader.cpp

[yazoo at users.sourceforge.net]

Revision: 29423
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29423&view=rev
Author:   yazoo
Date:     2007-11-05 12:51:23 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
Fix some 256color version issues

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/dataLoader.cpp

Modified: scummvm/trunk/engines/cruise/dataLoader.cpp
===================================================================
--- scummvm/trunk/engines/cruise/dataLoader.cpp	2007-11-05 20:24:20 UTC (rev 29422)
+++ scummvm/trunk/engines/cruise/dataLoader.cpp	2007-11-05 20:51:23 UTC (rev 29423)
@@ -117,8 +117,7 @@
 	uint8 *buffer;
 	uint8 *dataPtr = pCurrentFileEntry->subData.ptr;
 
-	int spriteSize =
-	    pCurrentFileEntry->height * pCurrentFileEntry->widthInColumn;
+	int spriteSize = pCurrentFileEntry->height * pCurrentFileEntry->widthInColumn;
 	int x = 0;
 	int range = pCurrentFileEntry->height * pCurrentFileEntry->width;
 
@@ -140,8 +139,7 @@
 
 		/* decode planes */
 		for (c = 0; c < 16; c++) {
-			buffer[x + c] =
-			    ((p0 >> 15) & 1) | ((p1 >> 14) & 2) | ((p2 >> 13) & 4) | ((p3 >> 12) & 8) | ((p4 >> 11) & 16);
+			buffer[x + c] = ((p0 >> 15) & 1) | ((p1 >> 14) & 2) | ((p2 >> 13) & 4) | ((p3 >> 12) & 8) | ((p4 >> 11) & 16);
 
 			p0 <<= 1;
 			p1 <<= 1;
@@ -388,8 +386,7 @@
 	}
 }
 
-void loadSetEntry(uint8 *name, uint8 *ptr, int currentEntryIdx,
-	    int currentDestEntry) {
+void loadSetEntry(uint8 *name, uint8 *ptr, int currentEntryIdx, int currentDestEntry) {
 	uint8 *ptr2;
 	uint8 *ptr3;
 	int offset;
@@ -455,6 +452,8 @@
 				filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn * 8;
 				filesDatabase[fileIndex].subData.resourceType = 2;
 				decodeGfxFormat1(&filesDatabase[fileIndex]);
+				filesDatabase[fileIndex].subData.index = currentDestEntry;
+				filesDatabase[fileIndex].subData.transparency = localBuffer.transparency % 0x10;
 				break;
 			}
 		case 4:
@@ -462,6 +461,8 @@
 				filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn * 2;
 				filesDatabase[fileIndex].subData.resourceType = 4;
 				decodeGfxFormat4(&filesDatabase[fileIndex]);
+				filesDatabase[fileIndex].subData.index = currentDestEntry;
+				filesDatabase[fileIndex].subData.transparency = localBuffer.transparency % 0x10;
 				break;
 			}
 		case 5:
@@ -471,14 +472,20 @@
 					ASSERT(0);
 					return;
 				}
+				
 				filesDatabase[fileIndex].subData.resourceType = 4;
 				decodeGfxFormat5(&filesDatabase[fileIndex]);
+				filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn;
+				filesDatabase[fileIndex].subData.index = currentDestEntry;
+				filesDatabase[fileIndex].subData.transparency = localBuffer.transparency;
 				break;
 			}
 		case 8:
 			{
-				ASSERT(0);
-				filesDatabase[fileIndex].subData.resourceType = 4;	// dummy !
+				filesDatabase[fileIndex].subData.resourceType = 4;
+				filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn;
+				filesDatabase[fileIndex].subData.index = currentDestEntry;
+				filesDatabase[fileIndex].subData.transparency = localBuffer.transparency;
 				break;
 			}
 		default:
@@ -488,9 +495,6 @@
 			}
 		}
 
-		filesDatabase[fileIndex].subData.index = currentDestEntry;
-		filesDatabase[fileIndex].subData.transparency = localBuffer.transparency % 0x10;
-
 		strcpyuint8(filesDatabase[fileIndex].subData.name, name);
 
 		// create the mask


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