summaryrefslogtreecommitdiff
path: root/src/guichan/widgets/slider.cpp
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-03-01 22:03:01 +0100
committerReid <reidyaro@gmail.com>2012-03-01 22:03:01 +0100
commit490862919d79369112c75955a9c36ff8a081efd3 (patch)
tree6fe89466b9c53ba811f298174e6d787bbae71e09 /src/guichan/widgets/slider.cpp
parentdff814619d63496acd3c4e8730b828b5d4d931fb (diff)
parentd873da3e8e57480016596f714845c1bc7e712e68 (diff)
downloadmanaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.gz
manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.bz2
manaverse-490862919d79369112c75955a9c36ff8a081efd3.tar.xz
manaverse-490862919d79369112c75955a9c36ff8a081efd3.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/guichan/widgets/slider.cpp')
-rw-r--r--src/guichan/widgets/slider.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 16f7cd8be..36f067eab 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -245,7 +245,7 @@ namespace gcn
else
w = getHeight();
- double pos = v / ((double)w - getMarkerLength());
+ double pos = v / (static_cast<double>(w) - getMarkerLength());
return (1.0 - pos) * getScaleStart() + pos * getScaleEnd();
}
@@ -257,7 +257,7 @@ namespace gcn
else
v = getHeight();
- int w = (int)((v - getMarkerLength())
+ int w = static_cast<int>((v - getMarkerLength())
* (value - getScaleStart())
/ (getScaleEnd() - getScaleStart()));