diff options
| author | Travis Howell | 2006-01-16 09:20:27 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-01-16 09:20:27 +0000 |
| commit | 631797d7e004bf1bdddd6c129694307b6a19e4f5 (patch) | |
| tree | 989b35bdb6daae2e0993d57ff751a2c4d850f8ae /scumm/wiz_he.cpp | |
| parent | fab5160c5fb68636fde396614a8c8d902d372789 (diff) | |
| download | scummvm-rg350-631797d7e004bf1bdddd6c129694307b6a19e4f5.tar.gz scummvm-rg350-631797d7e004bf1bdddd6c129694307b6a19e4f5.tar.bz2 scummvm-rg350-631797d7e004bf1bdddd6c129694307b6a19e4f5.zip | |
Match sizes of original versions, to avoid possible overflows.
svn-id: r20052
Diffstat (limited to 'scumm/wiz_he.cpp')
| -rw-r--r-- | scumm/wiz_he.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp index 408e9544c4..f2b4916338 100644 --- a/scumm/wiz_he.cpp +++ b/scumm/wiz_he.cpp @@ -1355,13 +1355,13 @@ void Wiz::flushWizBuffer() { _imagesNum = 0; } -void Wiz::loadImgSpot(int resId, int state, int16 &x, int16 &y) { +void Wiz::loadImgSpot(int resId, int state, int32 &x, int32 &y) { uint8 *dataPtr = _vm->getResourceAddress(rtImage, resId); assert(dataPtr); uint8 *spotPtr = _vm->findWrappedBlock(MKID('SPOT'), dataPtr, state, 0); if (spotPtr) { - x = (int16)READ_LE_UINT32(spotPtr + 0); - y = (int16)READ_LE_UINT32(spotPtr + 4); + x = READ_LE_UINT32(spotPtr + 0); + y = READ_LE_UINT32(spotPtr + 4); } else { x = 0; y = 0; @@ -1369,7 +1369,7 @@ void Wiz::loadImgSpot(int resId, int state, int16 &x, int16 &y) { } void Wiz::loadWizCursor(int resId) { - int16 x, y; + int32 x, y; loadImgSpot(resId, 0, x, y); if (x < 0) { x = 0; @@ -1733,7 +1733,7 @@ void Wiz::processWizImage(const WizParameters *params) { char buf[512]; unsigned int i; - debug(0, "processWizImage: processMode %d", params->processMode); + debug(5, "processWizImage: processMode %d", params->processMode); switch (params->processMode) { case 0: // Used in racedemo |