diff options
| author | Max Horn | 2003-09-19 19:11:33 +0000 |
|---|---|---|
| committer | Max Horn | 2003-09-19 19:11:33 +0000 |
| commit | d9b0a79390d0f149538348e45f49584eaad31c61 (patch) | |
| tree | 6021c2111696f61a9f8e300d8bc885cd8f1fe01a | |
| parent | a1735e55023d76294aaa5cb01a385388f2e47ae5 (diff) | |
| download | scummvm-rg350-d9b0a79390d0f149538348e45f49584eaad31c61.tar.gz scummvm-rg350-d9b0a79390d0f149538348e45f49584eaad31c61.tar.bz2 scummvm-rg350-d9b0a79390d0f149538348e45f49584eaad31c61.zip | |
fixed some pointer cast warnings on systems with 64 bit pointers (like AMD64)
svn-id: r10315
| -rw-r--r-- | backends/sdl/sdl-common.cpp | 4 | ||||
| -rw-r--r-- | scumm/saveload.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp index d74a4a2ede..6bb5bd19c7 100644 --- a/backends/sdl/sdl-common.cpp +++ b/backends/sdl/sdl-common.cpp @@ -146,7 +146,7 @@ void OSystem_SDL_Common::copy_rect(const byte *buf, int pitch, int x, int y, int StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends - if (((uint32)buf & 3) == 0 && pitch == _screenWidth && x==0 && y==0 && + if (((long)buf & 3) == 0 && pitch == _screenWidth && x==0 && y==0 && w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) { /* Special, optimized case for full screen updates. * It tries to determine what areas were actually changed, @@ -331,7 +331,7 @@ void OSystem_SDL_Common::mk_checksums(const byte *buf) { #undef ROL void OSystem_SDL_Common::add_dirty_rgn_auto(const byte *buf) { - assert(((uint32)buf & 3) == 0); + assert(((long)buf & 3) == 0); /* generate a table of the checksums */ mk_checksums(buf); diff --git a/scumm/saveload.h b/scumm/saveload.h index 5042befa06..e6120c6700 100644 --- a/scumm/saveload.h +++ b/scumm/saveload.h @@ -38,7 +38,7 @@ // current reality (many of our complex structs are non-POD; for an explanation of // what POD means refer to http://www-cpd.fnal.gov/personal/wb/boost/ISOcxx/doc/POD.html) -#define OFFS(type,item) (((int)(&((type*)42)->type::item))-42) +#define OFFS(type,item) (((long)(&((type*)42)->type::item))-42) #define SIZE(type,item) sizeof(((type*)42)->type::item) // Any item that is still in use automatically gets a maxVersion equal to CURRENT_VER |