diff options
| author | Filippos Karapetis | 2007-12-20 19:00:10 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-12-20 19:00:10 +0000 |
| commit | 335e9da41dfe5f019c83478f8ffe95b0a8807dd4 (patch) | |
| tree | fa820c30901978a5543560d87bc16517be470a1a /engines/saga/isomap.cpp | |
| parent | 0e744e491b785a8983fc5f4ab35d7ec644caa45e (diff) | |
| download | scummvm-rg350-335e9da41dfe5f019c83478f8ffe95b0a8807dd4.tar.gz scummvm-rg350-335e9da41dfe5f019c83478f8ffe95b0a8807dd4.tar.bz2 scummvm-rg350-335e9da41dfe5f019c83478f8ffe95b0a8807dd4.zip | |
Removed clamp() and used the common CLIP template instead
svn-id: r29927
Diffstat (limited to 'engines/saga/isomap.cpp')
| -rw-r--r-- | engines/saga/isomap.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/saga/isomap.cpp b/engines/saga/isomap.cpp index b49a9e1d0a..b6eb69b313 100644 --- a/engines/saga/isomap.cpp +++ b/engines/saga/isomap.cpp @@ -403,10 +403,10 @@ void IsoMap::drawSprite(Surface *ds, SpriteList &spriteList, int spriteNumber, c spritePointer.x = screenPosition.x + xAlign; spritePointer.y = screenPosition.y + yAlign; - _tileClip.left = CLIP((int)spritePointer.x, 0, _vm->getDisplayWidth()); - _tileClip.right = CLIP((int)spritePointer.x + width, 0, _vm->getDisplayWidth()); - _tileClip.top = CLIP((int)spritePointer.y, 0, _vm->_scene->getHeight()); - _tileClip.bottom = CLIP((int)spritePointer.y + height, 0, _vm->_scene->getHeight()); + _tileClip.left = CLIP<int>(spritePointer.x, 0, _vm->getDisplayWidth()); + _tileClip.right = CLIP<int>(spritePointer.x + width, 0, _vm->getDisplayWidth()); + _tileClip.top = CLIP<int>(spritePointer.y, 0, _vm->_scene->getHeight()); + _tileClip.bottom = CLIP<int>(spritePointer.y + height, 0, _vm->_scene->getHeight()); _vm->_sprite->drawClip(ds, clip, spritePointer, width, height, spriteBuffer); drawTiles(ds, &location); @@ -465,8 +465,8 @@ void IsoMap::drawTiles(Surface *ds, const Location *location) { metaTileIndex = 1; break; case kEdgeTypeRpt: - uc = clamp( 0, u2, SAGA_TILEMAP_W - 1); - vc = clamp( 0, v2, SAGA_TILEMAP_W - 1); + uc = CLIP<int16>(u2, 0, SAGA_TILEMAP_W - 1); + vc = CLIP<int16>(v2, 0, SAGA_TILEMAP_W - 1); metaTileIndex = _tileMap.tilePlatforms[uc][vc]; break; case kEdgeTypeWrap: @@ -509,8 +509,8 @@ void IsoMap::drawTiles(Surface *ds, const Location *location) { metaTileIndex = 1; break; case kEdgeTypeRpt: - uc = clamp( 0, u2, SAGA_TILEMAP_W - 1); - vc = clamp( 0, v2, SAGA_TILEMAP_W - 1); + uc = CLIP<int16>(u2, 0, SAGA_TILEMAP_W - 1); + vc = CLIP<int16>(v2, 0, SAGA_TILEMAP_W - 1); metaTileIndex = _tileMap.tilePlatforms[uc][vc]; break; case kEdgeTypeWrap: @@ -1010,8 +1010,8 @@ int16 IsoMap::getTileIndex(int16 u, int16 v, int16 z) { metaTileIndex = 1; break; case kEdgeTypeRpt: - uc = clamp( 0, mtileU, SAGA_TILEMAP_W - 1); - vc = clamp( 0, mtileV, SAGA_TILEMAP_W - 1); + uc = CLIP<int16>(mtileU, 0, SAGA_TILEMAP_W - 1); + vc = CLIP<int16>(mtileV, 0, SAGA_TILEMAP_W - 1); metaTileIndex = _tileMap.tilePlatforms[uc][vc]; break; case kEdgeTypeWrap: |