diff options
| author | Lars Persson | 2008-04-20 17:32:32 +0000 |
|---|---|---|
| committer | Lars Persson | 2008-04-20 17:32:32 +0000 |
| commit | 67cd04e9a0c384a56846e2ca6a9bb94980059754 (patch) | |
| tree | d397558ccfd2e9407b3723fd0802c4fd47246b6e | |
| parent | 65e608f304e2249de9588fe05bea80c6d6657ea3 (diff) | |
| download | scummvm-rg350-67cd04e9a0c384a56846e2ca6a9bb94980059754.tar.gz scummvm-rg350-67cd04e9a0c384a56846e2ca6a9bb94980059754.tar.bz2 scummvm-rg350-67cd04e9a0c384a56846e2ca6a9bb94980059754.zip | |
Implicit casts are causing problems for CodeWarrior compilers, added C casts.
svn-id: r31623
| -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 55decc2f00..b712e14712 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(_colorCount, index); + _colorCount = MAX((int) _colorCount, (int) index); } /* @@ -358,8 +358,8 @@ AssetManager::~AssetManager() { bool AssetManager::clearAssets(AssetType assetType, int32 minHash, int32 maxHash) { - minHash = MAX(0, minHash); - maxHash = MIN(maxHash, 255); + minHash = MAX(0, (int) minHash); + maxHash = MIN((int) maxHash, 255); switch (assetType) { case kAssetTypeMACH: |