From 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 16:18:13 +0300 Subject: Replace most static_cast to shorter versions from defines. --- src/gui/windows/minimap.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/gui/windows/minimap.cpp') diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index ae93c9190..797427c50 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -375,9 +375,9 @@ void Minimap::draw2(Graphics *const graphics) if (userPalette) graphics->setColor(userPalette->getColor(type)); - const int offsetHeight = static_cast(static_cast( + const int offsetHeight = CAST_S32(static_cast( dotSize - 1) * mHeightProportion); - const int offsetWidth = static_cast(static_cast( + const int offsetWidth = CAST_S32(static_cast( dotSize - 1) * mWidthProportion); const Vector &pos = being->getPosition(); @@ -414,15 +414,15 @@ void Minimap::draw2(Graphics *const graphics) UserColorId::PARTY)); } - const int offsetHeight = static_cast( + const int offsetHeight = CAST_S32( mHeightProportion); - const int offsetWidth = static_cast( + const int offsetWidth = CAST_S32( mWidthProportion); graphics->fillRectangle(Rect( - static_cast(member->getX() + CAST_S32(member->getX() * mWidthProportion) + mMapOriginX - offsetWidth, - static_cast(member->getY() + CAST_S32(member->getY() * mHeightProportion) + mMapOriginY - offsetHeight, 2, 2)); } @@ -443,9 +443,9 @@ void Minimap::draw2(Graphics *const graphics) + viewport->getCameraRelativeY()) * mHeightProportion) / 32 + mMapOriginY; - const int w = static_cast(static_cast( + const int w = CAST_S32(static_cast( gw) * mWidthProportion / 32); - const int h = static_cast(static_cast( + const int h = CAST_S32(static_cast( gh) * mHeightProportion / 32); if (w <= a.width) -- cgit v1.2.3-70-g09d2