[Scummvm-cvs-logs] SF.net SVN: scummvm: [31626] scummvm/trunk/engines/m4/assets.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sun Apr 20 21:16:34 CEST 2008
Revision: 31626
http://scummvm.svn.sourceforge.net/scummvm/?rev=31626&view=rev
Author: lordhoto
Date: 2008-04-20 12:16:34 -0700 (Sun, 20 Apr 2008)
Log Message:
-----------
Cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/m4/assets.cpp
Modified: scummvm/trunk/engines/m4/assets.cpp
===================================================================
--- scummvm/trunk/engines/m4/assets.cpp 2008-04-20 19:02:34 UTC (rev 31625)
+++ scummvm/trunk/engines/m4/assets.cpp 2008-04-20 19:16:34 UTC (rev 31626)
@@ -255,7 +255,7 @@
_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 @@
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:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list