mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-17 07:22:41 +00:00
Implicit casts are causing problems for CodeWarrior compilers, added C casts.
svn-id: r31623
This commit is contained in:
parent
65e608f304
commit
67cd04e9a0
@ -255,7 +255,7 @@ int32 SpriteAsset::parseSprite(bool isBigEndian) {
|
|||||||
_palette[index].g = ((paletteEntry >> 8) & 0xFF) << 2;
|
_palette[index].g = ((paletteEntry >> 8) & 0xFF) << 2;
|
||||||
_palette[index].b = (paletteEntry & 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) {
|
bool AssetManager::clearAssets(AssetType assetType, int32 minHash, int32 maxHash) {
|
||||||
|
|
||||||
minHash = MAX(0, minHash);
|
minHash = MAX(0, (int) minHash);
|
||||||
maxHash = MIN(maxHash, 255);
|
maxHash = MIN((int) maxHash, 255);
|
||||||
|
|
||||||
switch (assetType) {
|
switch (assetType) {
|
||||||
case kAssetTypeMACH:
|
case kAssetTypeMACH:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user