diff options
| author | Lars Persson | 2009-07-01 20:11:44 +0000 |
|---|---|---|
| committer | Lars Persson | 2009-07-01 20:11:44 +0000 |
| commit | 62acda5fdbe0daaeae9e1d0f08044b8be4ee98cf (patch) | |
| tree | 73726b541af8be4017fa7c939b4155b953351b4b | |
| parent | 4b850a2c0357aa2d94cfc2fcf5d05ed0903278e5 (diff) | |
| download | scummvm-rg350-62acda5fdbe0daaeae9e1d0f08044b8be4ee98cf.tar.gz scummvm-rg350-62acda5fdbe0daaeae9e1d0f08044b8be4ee98cf.tar.bz2 scummvm-rg350-62acda5fdbe0daaeae9e1d0f08044b8be4ee98cf.zip | |
Use MIN with correct template parameter.
svn-id: r42008
| -rw-r--r-- | engines/gob/inter_v1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp index d5d5fcad9a..96ecfc6b25 100644 --- a/engines/gob/inter_v1.cpp +++ b/engines/gob/inter_v1.cpp @@ -1095,7 +1095,7 @@ bool Inter_v1::o1_palLoad(OpFuncParams ¶ms) { if (!resource) break; - memcpy((char *) _vm->_draw->_vgaPalette, resource->getData(), MIN(768, resource->getSize())); + memcpy((char *) _vm->_draw->_vgaPalette, resource->getData(), MIN<int>(768, resource->getSize())); delete resource; break; |