[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.35,1.36 text.cpp,1.42,1.43

[Robert G?ffringmann]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv9906/sky

Modified Files:
	disk.cpp text.cpp 
Log Message:
fixed M$VC++ warnings in text.cpp and added code to disk.cpp which may or may not fix graphics problems in hobbins' room on big endian systems (can't test that).

Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- disk.cpp	7 Jul 2003 00:14:16 -0000	1.35
+++ disk.cpp	7 Jul 2003 02:54:59 -0000	1.36
@@ -210,8 +210,17 @@
 			
 		if (_fixedDest == NULL)
 			free(_fileDest);
-	} else
+	} else {
+#ifdef SCUMM_BIG_ENDIAN
+		if (!cflag) {
+			warning("patching header for uncompressed file %d", fileNr);
+			uint16 *headPtr = (uint16 *)_fileDest;
+		    for (uint i = 0; i < sizeof(struct dataFileHeader) / 2; i++)
+				*(headPtr + i) = READ_LE_UINT16(headPtr + i);
+		}
+#endif
 		return _fileDest;
+	}
 
 	return _compDest;
 }

Index: text.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/text.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- text.cpp	7 Jul 2003 00:22:41 -0000	1.42
+++ text.cpp	7 Jul 2003 02:54:59 -0000	1.43
@@ -287,8 +287,8 @@
 
 	//make the header
 	((struct dataFileHeader *)curDest)->s_width = _dtLineWidth;
-	((struct dataFileHeader *)curDest)->s_height = _charHeight * _dtLines;
-	((struct dataFileHeader *)curDest)->s_sp_size = _dtLineWidth * _charHeight * _dtLines;
+	((struct dataFileHeader *)curDest)->s_height = (uint16)(_charHeight * _dtLines);
+	((struct dataFileHeader *)curDest)->s_sp_size = (uint16)(_dtLineWidth * _charHeight * _dtLines);
 	((struct dataFileHeader *)curDest)->s_offset_x = 0;
 	((struct dataFileHeader *)curDest)->s_offset_y = 0;