diff options
| author | Eugene Sandulenko | 2016-08-01 08:39:05 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-08-01 08:39:34 +0300 |
| commit | e5a34d1353c9303e5225fcdce6064329b6723022 (patch) | |
| tree | 9ee8d90f61f781fb61abeab21d2021a84e241007 /engines/titanic | |
| parent | 75f5a988b23a824b26b24caee6e785fa5cbef0e5 (diff) | |
| download | scummvm-rg350-e5a34d1353c9303e5225fcdce6064329b6723022.tar.gz scummvm-rg350-e5a34d1353c9303e5225fcdce6064329b6723022.tar.bz2 scummvm-rg350-e5a34d1353c9303e5225fcdce6064329b6723022.zip | |
TITANIC: Fix compilation for openpandora
Diffstat (limited to 'engines/titanic')
| -rw-r--r-- | engines/titanic/pet_control/pet_slider.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/pet_control/pet_slider.cpp b/engines/titanic/pet_control/pet_slider.cpp index 67f324aee1..166ba30c74 100644 --- a/engines/titanic/pet_control/pet_slider.cpp +++ b/engines/titanic/pet_control/pet_slider.cpp @@ -157,7 +157,7 @@ int CPetSlider::calcSliderOffset(const Point &pt) const { if (_orientation & ORIENTATION_HORIZONTAL) { result = CLIP(pt.x, _slidingRect.left, _slidingRect.right) - _slidingRect.left; } - + if (_orientation & ORIENTATION_VERTICAL) { result = CLIP(pt.y, _slidingRect.top, _slidingRect.bottom) - _slidingRect.top; } @@ -173,9 +173,9 @@ void CPetSlider::stepPosition(int direction) { double val = getOffsetPixels(); if (direction == -1) { - val = MAX(val - 0.1, 0.0); + val = MAX<double>(val - 0.1, 0.0); } else if (direction == 1) { - val = MIN(val + 0.1, 1.0); + val = MIN<double>(val + 0.1, 1.0); } setSliderOffset(val); @@ -200,7 +200,7 @@ void CPetSoundSlider::setupBackground2(const CString &name, CPetControl *petCont CString numStr = "3"; int mode = petControl->getPassengerClass(); if (mode <= 3) { - numStr = CString(mode); + numStr = CString(mode); } else if (mode == 4) { mode = petControl->getPriorClass(); if (mode == 1) { |