[Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.7,1.8
Oliver Kiehl
olki at users.sourceforge.net
Thu Mar 6 01:45:05 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush blitter.cpp,1.6,1.7 blitter.h,1.6,1.7 brenderer.cpp,1.3,1.4 brenderer.h,1.5,1.6 channel.h,1.7,1.8 chunk.cpp,1.8,1.9 chunk.h,1.5,1.6 codec1.cpp,1.4,1.5 codec37.cpp,1.13,1.14 codec37.h,1.6,1.7 codec44.cpp,1.5,1.6 codec44.h,1.4,1.5 codec47.cpp,1.39,1.40 codec47.h,1.9,1.10 decoder.h,1.4,1.5 frenderer.cpp,1.14,1.15 frenderer.h,1.8,1.9 imuse_channel.cpp,1.11,1.12 player.cpp,1.38,1.39 player.h,1.12,1.13 renderer.h,1.5,1.6 saud_channel.cpp,1.8,1.9 scumm_renderer.cpp,1.24,1.25 scumm_renderer.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.8,1.9 rnc_deco.cpp,1.7,1.8 sky.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv18722
Modified Files:
disk.cpp
Log Message:
cleanup
Index: disk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/disk.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- disk.cpp 6 Mar 2003 07:52:39 -0000 1.7
+++ disk.cpp 6 Mar 2003 09:44:50 -0000 1.8
@@ -71,7 +71,6 @@
uint16 *SkyState::load_file(uint16 file_nr, uint8 *dest)
{
uint8 cflag;
- uint32 eax, ecx;
int32 bytes_read;
uint8 *file_ptr, *esiptr, *ediptr;
dataFileHeader file_header;
@@ -89,27 +88,23 @@
return NULL;
}
- eax = READ_LE_UINT32((file_ptr + 5));
- file_flags = eax;
- eax &= 0x03fffff;
- file_size = eax;
+ file_flags = READ_LE_UINT32((file_ptr + 5));
+ file_size = file_flags & 0x03fffff;
- ecx = READ_LE_UINT32((file_ptr + 2));
- ecx &= 0x0ffffff;
+ file_offset = READ_LE_UINT32((file_ptr + 2)) & 0x0ffffff;
- cflag = (uint8)((ecx >> (23)) & 0x1);
- ecx = (((1 << (23)) ^ 0xFFFFFFFF) & ecx);
+ cflag = (uint8)((file_offset >> (23)) & 0x1);
+ file_offset = (((1 << (23)) ^ 0xFFFFFFFF) & file_offset);
if (cflag)
- ecx = ecx << 4;
+ file_offset <<= 4;
- file_offset = ecx;
fixed_dest = dest;
file_dest = dest;
comp_dest = dest;
if (dest == NULL) //we need to allocate memory for this file
- file_dest = (uint8 *)malloc(eax);
+ file_dest = (uint8 *)malloc(file_size);
data_disk_handle->seek(file_offset, SEEK_SET);
@@ -127,23 +122,18 @@
//if cflag == 0 then file is compressed, 1 == uncompressed
- if (!cflag)
- {
+ if (!cflag) {
debug(1, "File is compressed...");
memcpy(&file_header, file_dest, sizeof(struct dataFileHeader));
if ( (uint8)((FROM_LE_16(file_header.flag) >> 7) & 0x1) ) {
debug(1, "with RNC!");
- eax = FROM_LE_16(file_header.flag);
- eax &= 0xFFFFFF00; //clear al
- eax = eax << 8;
- eax |= FROM_LE_16((uint16)file_header.s_tot_size);
-
- decomp_size = eax;
+ decomp_size = (FROM_LE_16(file_header.flag) & 0xFFFFFF00) << 8;
+ decomp_size |= FROM_LE_16((uint16)file_header.s_tot_size);
if (fixed_dest == NULL) // is this valid?
- comp_dest = (uint8 *)malloc(eax);
+ comp_dest = (uint8 *)malloc(decomp_size);
esiptr = file_dest;
ediptr = comp_dest;
@@ -156,11 +146,11 @@
ediptr += sizeof(struct dataFileHeader);
}
- eax = UnpackM1(esiptr, ediptr, 0);
+ uint32 unPackLen = UnpackM1(esiptr, ediptr, 0);
- debug(2, "UnpackM1 returned: %d", eax);
+ debug(2, "UnpackM1 returned: %d", unPackLen);
- if (eax == 0) { //Unpack returned 0: file was probably not packed.
+ if (unPackLen == 0) { //Unpack returned 0: file was probably not packed.
if (fixed_dest == NULL)
free(comp_dest);
@@ -168,21 +158,19 @@
}
if (! (uint8)(file_flags >> (22) & 0x1) ) { // include header?
- eax += sizeof(struct dataFileHeader);
+ unPackLen += sizeof(struct dataFileHeader);
- if (eax != decomp_size) {
- debug(1, "ERROR: invalid decomp size! (was: %d, should be: %d)", eax, decomp_size);
+ if (unPackLen != decomp_size) {
+ debug(1, "ERROR: invalid decomp size! (was: %d, should be: %d)", unPackLen, decomp_size);
}
}
if (fixed_dest == NULL)
free(file_dest);
- }
- else
+ } else
debug(1, "but not with RNC! (?!)");
- }
- else
+ } else
return (uint16 *)file_dest;
return (uint16 *)comp_dest;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush blitter.cpp,1.6,1.7 blitter.h,1.6,1.7 brenderer.cpp,1.3,1.4 brenderer.h,1.5,1.6 channel.h,1.7,1.8 chunk.cpp,1.8,1.9 chunk.h,1.5,1.6 codec1.cpp,1.4,1.5 codec37.cpp,1.13,1.14 codec37.h,1.6,1.7 codec44.cpp,1.5,1.6 codec44.h,1.4,1.5 codec47.cpp,1.39,1.40 codec47.h,1.9,1.10 decoder.h,1.4,1.5 frenderer.cpp,1.14,1.15 frenderer.h,1.8,1.9 imuse_channel.cpp,1.11,1.12 player.cpp,1.38,1.39 player.h,1.12,1.13 renderer.h,1.5,1.6 saud_channel.cpp,1.8,1.9 scumm_renderer.cpp,1.24,1.25 scumm_renderer.h,1.9,1.10
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sky disk.cpp,1.8,1.9 rnc_deco.cpp,1.7,1.8 sky.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list