[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.2,1.3 struc.h,1.1,1.2
Oliver Kiehl
olki at users.sourceforge.net
Wed Mar 5 14:14:07 CET 2003
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv17714
Modified Files:
disk.cpp struc.h
Log Message:
renamed struct s
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- disk.cpp 5 Mar 2003 21:34:44 -0000 1.2
+++ disk.cpp 5 Mar 2003 22:13:40 -0000 1.3
@@ -132,7 +132,7 @@
{
debug(1, "File is compressed...");
- memcpy(&file_header, file_dest, sizeof(struct s));
+ memcpy(&file_header, file_dest, sizeof(struct dataFileHeader));
if ( (uint8)((FROM_LE_16(file_header.flag) >> 7) & 0x1) ) {
debug(1, "with RNC!");
@@ -150,11 +150,11 @@
ediptr = comp_dest;
if ( (uint8)(file_flags >> (22) & 0x1) ) //do we include the header?
- esiptr += sizeof(struct s);
+ esiptr += sizeof(struct dataFileHeader);
else {
- memcpy(ediptr, esiptr, sizeof(struct s));
- esiptr += sizeof(struct s);
- ediptr += sizeof(struct s);
+ memcpy(ediptr, esiptr, sizeof(struct dataFileHeader));
+ esiptr += sizeof(struct dataFileHeader);
+ ediptr += sizeof(struct dataFileHeader);
}
eax = UnpackM1(esiptr, ediptr, 0);
@@ -169,7 +169,7 @@
}
if (! (uint8)(file_flags >> (22) & 0x1) ) { //include header?
- eax += sizeof(struct s);
+ eax += sizeof(struct dataFileHeader);
if (eax != decomp_size)
{
Index: struc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/struc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- struc.h 5 Mar 2003 19:04:34 -0000 1.1
+++ struc.h 5 Mar 2003 22:13:40 -0000 1.2
@@ -19,7 +19,7 @@
*
*/
-typedef struct s
+typedef struct dataFileHeader
{
uint16 flag; // bit 0: set for colour data, clear for not
// bit 1: set for compressed, clear for uncompressed
More information about the Scummvm-git-logs
mailing list