[Scummvm-cvs-logs] scummvm master -> e5a34d1353c9303e5225fcdce6064329b6723022
sev-
sev at scummvm.org
Mon Aug 1 07:40:10 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e5a34d1353 TITANIC: Fix compilation for openpandora
Commit: e5a34d1353c9303e5225fcdce6064329b6723022
https://github.com/scummvm/scummvm/commit/e5a34d1353c9303e5225fcdce6064329b6723022
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-01T08:39:34+03:00
Commit Message:
TITANIC: Fix compilation for openpandora
Changed paths:
engines/titanic/pet_control/pet_slider.cpp
diff --git a/engines/titanic/pet_control/pet_slider.cpp b/engines/titanic/pet_control/pet_slider.cpp
index 67f324a..166ba30 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) {
More information about the Scummvm-git-logs
mailing list