aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-10-09 15:42:55 +0000
committerTorbjörn Andersson2006-10-09 15:42:55 +0000
commit651f9f2ad7367ab1e57d51ea179dacf3025bcf3c (patch)
tree12374052c2eac9650bfdd63e11196d927f52b36a
parent82775ed89006f4913fe985c6b6069341ef11634e (diff)
downloadscummvm-rg350-651f9f2ad7367ab1e57d51ea179dacf3025bcf3c.tar.gz
scummvm-rg350-651f9f2ad7367ab1e57d51ea179dacf3025bcf3c.tar.bz2
scummvm-rg350-651f9f2ad7367ab1e57d51ea179dacf3025bcf3c.zip
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. svn-id: r24254
-rw-r--r--engines/agos/res_ami.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp
index 30a2e7b6c7..f4b9a2d949 100644
--- a/engines/agos/res_ami.cpp
+++ b/engines/agos/res_ami.cpp
@@ -275,9 +275,9 @@ void AGOSEngine::convertAmiga(byte *srcBuf, int32 fileSize) {
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 @@ void AGOSEngine::convertAmiga(byte *srcBuf, int32 fileSize) {
clipnumber++;
}
- clipsend = (byte *)(clipoffset + (uint32)buffer);
+ clipsend = buffer + clipoffset;
bufoutend = clipoffset;
while (bufptr <= clipsend) {
if (clipoffset != 0) {
@@ -294,9 +294,9 @@ void AGOSEngine::convertAmiga(byte *srcBuf, int32 fileSize) {
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;