diff options
| author | Johannes Schickel | 2008-04-20 19:16:34 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-20 19:16:34 +0000 |
| commit | bd1cee2104b7f4e29dc299eaa9ebde61c390972a (patch) | |
| tree | 6380e09c3b8ad583c6b9e9af299b9d24a9f362e1 /engines/m4 | |
| parent | 15b4b62fbbd9ff50a6e46909ebcbc556e9f2ab29 (diff) | |
| download | scummvm-rg350-bd1cee2104b7f4e29dc299eaa9ebde61c390972a.tar.gz scummvm-rg350-bd1cee2104b7f4e29dc299eaa9ebde61c390972a.tar.bz2 scummvm-rg350-bd1cee2104b7f4e29dc299eaa9ebde61c390972a.zip | |
Cleanup.
svn-id: r31626
Diffstat (limited to 'engines/m4')
| -rw-r--r-- | engines/m4/assets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/m4/assets.cpp b/engines/m4/assets.cpp index b712e14712..80b21119ff 100644 --- a/engines/m4/assets.cpp +++ b/engines/m4/assets.cpp @@ -255,7 +255,7 @@ int32 SpriteAsset::parseSprite(bool isBigEndian) { _palette[index].g = ((paletteEntry >> 8) & 0xFF) << 2; _palette[index].b = (paletteEntry & 0xFF) << 2; - _colorCount = MAX((int) _colorCount, (int) index); + _colorCount = MAX<int>(_colorCount, index); } /* @@ -358,8 +358,8 @@ AssetManager::~AssetManager() { bool AssetManager::clearAssets(AssetType assetType, int32 minHash, int32 maxHash) { - minHash = MAX(0, (int) minHash); - maxHash = MIN((int) maxHash, 255); + minHash = MAX<int>(0, minHash); + maxHash = MIN<int>(maxHash, 255); switch (assetType) { case kAssetTypeMACH: |