diff options
| author | Vincent Hamm | 2002-03-05 23:41:41 +0000 |
|---|---|---|
| committer | Vincent Hamm | 2002-03-05 23:41:41 +0000 |
| commit | c21e9da1b6c46f145f8061ca77dd5b9b9627e782 (patch) | |
| tree | 824f1ce524979fd09ef6a88e6268cd3c30f97d3f /object.cpp | |
| parent | 8d6efb265f1d38599d80eebe80570b5bfba944f8 (diff) | |
| download | scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.tar.gz scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.tar.bz2 scummvm-rg350-c21e9da1b6c46f145f8061ca77dd5b9b9627e782.zip | |
Next episode in V7 reimplementation. Nearly working
svn-id: r3658
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/object.cpp b/object.cpp index cbbbc71d07..efb7602fa8 100644 --- a/object.cpp +++ b/object.cpp @@ -1045,13 +1045,13 @@ void Scumm::setCursorImg(uint img, uint room, uint imgindex) { READ_LE_UINT16(&foir.imhd->old.hotspot[0].y)); -#if !defined(FULL_THROTTLE) - w = READ_LE_UINT16(&foir.cdhd->v6.w)>>3; - h = READ_LE_UINT16(&foir.cdhd->v6.h)>>3; -#else - w = READ_LE_UINT16(&foir.imhd->v7.width)>>3; - h = READ_LE_UINT16(&foir.imhd->v7.height)>>3; -#endif + if(!(_features & GF_AFTER_V7)) { + w = READ_LE_UINT16(&foir.cdhd->v6.w)>>3; + h = READ_LE_UINT16(&foir.cdhd->v6.h)>>3; + } else { + w = READ_LE_UINT16(&foir.imhd->v7.width)>>3; + h = READ_LE_UINT16(&foir.imhd->v7.height)>>3; + } dataptr = findResource(IMxx_tags[imgindex],foir.obim); if (dataptr==NULL) |