diff options
| author | Max Horn | 2003-05-21 18:09:49 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-21 18:09:49 +0000 |
| commit | 86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8 (patch) | |
| tree | aa7c2126baa9dd2ca7dd80910f5835b6aa861294 /scumm/object.cpp | |
| parent | 11d29b71ab4400e6e732ba7cd49a343150360eaf (diff) | |
| download | scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.gz scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.tar.bz2 scummvm-rg350-86d57f3c7af8fd0d4c6a4d1751ccdaac77c3b2e8.zip | |
many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 8b2fa3bb61..15cbcfb346 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -899,7 +899,7 @@ byte *Scumm::getObjOrActorName(int obj) { objptr = getOBCDFromObject(obj); if (objptr == NULL) - return (byte *)" "; + return NULL; return findResourceData(MKID('OBNA'), objptr); } @@ -1596,7 +1596,7 @@ static byte _bompBitsTable[] = { int32 Scumm::setupBompScale(byte * scalling, int32 size, byte scale) { uint32 tmp = (256 - (size >> 1)); int32 count = (size + 7) >> 3; - assert(0 <= tmp && tmp < sizeof(_bompScaleTable)); + assert(tmp < sizeof(_bompScaleTable)); byte * tmp_ptr = _bompScaleTable + tmp; byte * tmp_scalling = scalling; byte a = 0; @@ -1656,7 +1656,7 @@ int32 Scumm::setupBompScale(byte * scalling, int32 size, byte scale) { byte ret_value = 0; while(count--) { tmp = *scalling++; - assert(0 <= tmp && tmp < sizeof(_bompBitsTable)); + assert(tmp < sizeof(_bompBitsTable)); ret_value += _bompBitsTable[tmp]; } |