[Scummvm-cvs-logs] SF.net SVN: scummvm: [24254] scummvm/trunk/engines/agos/res_ami.cpp
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Mon Oct 9 17:42:59 CEST 2006
Revision: 24254
http://svn.sourceforge.net/scummvm/?rev=24254&view=rev
Author: eriktorbjorn
Date: 2006-10-09 08:42:55 -0700 (Mon, 09 Oct 2006)
Log Message:
-----------
Casting 'buffer' to uint32 makes absolutely no sense to me. As far as I can
tell, we just want to add an offset to a byte pointer.
Modified Paths:
--------------
scummvm/trunk/engines/agos/res_ami.cpp
Modified: scummvm/trunk/engines/agos/res_ami.cpp
===================================================================
--- scummvm/trunk/engines/agos/res_ami.cpp 2006-10-09 13:00:25 UTC (rev 24253)
+++ scummvm/trunk/engines/agos/res_ami.cpp 2006-10-09 15:42:55 UTC (rev 24254)
@@ -275,9 +275,9 @@
bufptrout = bufferout;
clipnumber = 0;
while(1) {
- clipoffset = READ_BE_UINT32(bufptr); bufptr +=4;
- clipheight = READ_BE_UINT16(bufptr); bufptr +=2;
- clipwidth = READ_BE_UINT16(bufptr); bufptr +=2;
+ clipoffset = READ_BE_UINT32(bufptr); bufptr += 4;
+ clipheight = READ_BE_UINT16(bufptr); bufptr += 2;
+ clipwidth = READ_BE_UINT16(bufptr); bufptr += 2;
if (clipoffset != 0)
break;
WRITE_BE_UINT32(bufptrout, 0); bufptrout += 4;
@@ -285,7 +285,7 @@
clipnumber++;
}
- clipsend = (byte *)(clipoffset + (uint32)buffer);
+ clipsend = buffer + clipoffset;
bufoutend = clipoffset;
while (bufptr <= clipsend) {
if (clipoffset != 0) {
@@ -294,9 +294,9 @@
WRITE_BE_UINT32(bufptrout, 0); bufptrout += 4;
WRITE_BE_UINT32(bufptrout, 0); bufptrout += 4;
}
- clipoffset = READ_BE_UINT32(bufptr); bufptr +=4;
- clipheight = READ_BE_UINT16(bufptr); bufptr +=2;
- clipwidth = READ_BE_UINT16(bufptr); bufptr +=2;
+ clipoffset = READ_BE_UINT32(bufptr); bufptr += 4;
+ clipheight = READ_BE_UINT16(bufptr); bufptr += 2;
+ clipwidth = READ_BE_UINT16(bufptr); bufptr += 2;
clipnumber++;
}
outlength = bufoutend;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list