aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2012-06-11 15:09:48 +0200
committerSven Hesse2012-06-11 15:11:15 +0200
commitf87e8b53f333c6799302d620a2c36668b92c77f0 (patch)
tree383efb7e830d674118b846a3803e8474dccf4534
parenta3db17033f9b251760e76d4ba7c7e66003cc228d (diff)
downloadscummvm-rg350-f87e8b53f333c6799302d620a2c36668b92c77f0.tar.gz
scummvm-rg350-f87e8b53f333c6799302d620a2c36668b92c77f0.tar.bz2
scummvm-rg350-f87e8b53f333c6799302d620a2c36668b92c77f0.zip
GOB: Fix an AmigaOS compile error
Should close bug #3534287.
-rw-r--r--engines/gob/minigames/geisha/meter.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/gob/minigames/geisha/meter.cpp b/engines/gob/minigames/geisha/meter.cpp
index 719ecf3d18..7ec3119866 100644
--- a/engines/gob/minigames/geisha/meter.cpp
+++ b/engines/gob/minigames/geisha/meter.cpp
@@ -67,7 +67,7 @@ int32 Meter::increase(int32 n) {
if (n < 0)
return decrease(-n);
- int32 overflow = MAX(0, (_value + n) - _maxValue);
+ int32 overflow = MAX<int32>(0, (_value + n) - _maxValue);
int32 value = CLIP<int32>(_value + n, 0, _maxValue);
if (_value == value)
@@ -83,7 +83,7 @@ int32 Meter::decrease(int32 n) {
if (n < 0)
return increase(-n);
- int32 underflow = -MIN(0, _value - n);
+ int32 underflow = -MIN<int32>(0, _value - n);
int32 value = CLIP<int32>(_value - n, 0, _maxValue);
if (_value == value)