summaryrefslogtreecommitdiff
path: root/src/guichan
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-02 21:38:23 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-02 21:40:43 +0300
commit4cffca0da71771d0d51ba4cd4842d2d93aa2946e (patch)
tree99b974a5bab64174ebd29ef7a4761caef01acec8 /src/guichan
parent1dab21b236d76900f3ddd2be32f9590aef394c2d (diff)
downloadplus-4cffca0da71771d0d51ba4cd4842d2d93aa2946e.tar.gz
plus-4cffca0da71771d0d51ba4cd4842d2d93aa2946e.tar.bz2
plus-4cffca0da71771d0d51ba4cd4842d2d93aa2946e.tar.xz
plus-4cffca0da71771d0d51ba4cd4842d2d93aa2946e.zip
Fix some conversions.
Diffstat (limited to 'src/guichan')
-rw-r--r--src/guichan/color.cpp6
-rw-r--r--src/guichan/sdl/sdlgraphics.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
index 7cc3b887a..87d110b63 100644
--- a/src/guichan/color.cpp
+++ b/src/guichan/color.cpp
@@ -106,9 +106,9 @@ namespace gcn
Color Color::operator*(const float value) const
{
- Color result(static_cast<int>(r * value),
- static_cast<int>(g * value),
- static_cast<int>(b * value),
+ Color result(static_cast<int>(static_cast<float>(r) * value),
+ static_cast<int>(static_cast<float>(g) * value),
+ static_cast<int>(static_cast<float>(b) * value),
a);
result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r));
diff --git a/src/guichan/sdl/sdlgraphics.cpp b/src/guichan/sdl/sdlgraphics.cpp
index 952be9093..482642e30 100644
--- a/src/guichan/sdl/sdlgraphics.cpp
+++ b/src/guichan/sdl/sdlgraphics.cpp
@@ -596,8 +596,8 @@ namespace gcn
const ClipRectangle& top = mClipStack.top();
- destination.x += top.xOffset;
- destination.y += top.yOffset;
+ destination.x += static_cast<int16_t>(top.xOffset);
+ destination.y += static_cast<int16_t>(top.yOffset);
SDL_BlitSurface(surface, &source, mTarget, &destination);
}