diff options
| author | Oliver Kiehl | 2003-03-05 22:13:40 +0000 |
|---|---|---|
| committer | Oliver Kiehl | 2003-03-05 22:13:40 +0000 |
| commit | c349bf123c918de42b39394eb0ab2f32bd74ae5a (patch) | |
| tree | dea7420592525dd936ee1e9971e0f3e85fe39774 /sky/disk.cpp | |
| parent | 9612e866b90f1fe13048f64e3e32efb154addfaa (diff) | |
| download | scummvm-rg350-c349bf123c918de42b39394eb0ab2f32bd74ae5a.tar.gz scummvm-rg350-c349bf123c918de42b39394eb0ab2f32bd74ae5a.tar.bz2 scummvm-rg350-c349bf123c918de42b39394eb0ab2f32bd74ae5a.zip | |
renamed struct s
svn-id: r6698
Diffstat (limited to 'sky/disk.cpp')
| -rw-r--r-- | sky/disk.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sky/disk.cpp b/sky/disk.cpp index 74ac73fd21..0827fdeeef 100644 --- a/sky/disk.cpp +++ b/sky/disk.cpp @@ -132,7 +132,7 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest) { 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 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest) 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 @@ uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest) } if (! (uint8)(file_flags >> (22) & 0x1) ) { //include header? - eax += sizeof(struct s); + eax += sizeof(struct dataFileHeader); if (eax != decomp_size) { |