summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-29 17:24:52 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-29 17:59:57 +0300
commitf315432679f760b71505e74dcb2185b7aef7a906 (patch)
tree07d45620464a2542cb28fbe773f652501e6ee6fb /src/gui
parentcccb3e11663eb415b9b6c9a184e1c17762a2d989 (diff)
downloadManaVerse-f315432679f760b71505e74dcb2185b7aef7a906.tar.gz
ManaVerse-f315432679f760b71505e74dcb2185b7aef7a906.tar.bz2
ManaVerse-f315432679f760b71505e74dcb2185b7aef7a906.tar.xz
ManaVerse-f315432679f760b71505e74dcb2185b7aef7a906.zip
change smaller letter literalt into capital letter.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/equipmentwindow.cpp2
-rw-r--r--src/gui/gui.cpp8
-rw-r--r--src/gui/inventorywindow.cpp4
-rw-r--r--src/gui/killstats.cpp2
-rw-r--r--src/gui/sdlfont.cpp2
-rw-r--r--src/gui/serverdialog.cpp12
-rw-r--r--src/gui/setup_theme.cpp2
-rw-r--r--src/gui/setup_touch.cpp8
-rw-r--r--src/gui/skilldialog.cpp2
-rw-r--r--src/gui/statuswindow.cpp4
-rw-r--r--src/gui/theme.cpp4
-rw-r--r--src/gui/theme.h4
-rw-r--r--src/gui/updaterwindow.cpp12
-rw-r--r--src/gui/viewport.cpp2
-rw-r--r--src/gui/widgets/colorpage.cpp2
-rw-r--r--src/gui/widgets/dropdown.cpp2
-rw-r--r--src/gui/widgets/dropshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/extendedlistbox.cpp2
-rw-r--r--src/gui/widgets/guitable.cpp4
-rw-r--r--src/gui/widgets/itemcontainer.cpp2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp6
-rw-r--r--src/gui/widgets/listbox.cpp2
-rw-r--r--src/gui/widgets/progressbar.cpp10
-rw-r--r--src/gui/widgets/progressbar.h2
-rw-r--r--src/gui/widgets/shoplistbox.cpp4
-rw-r--r--src/gui/widgets/skillinfo.cpp4
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp2
-rw-r--r--src/gui/widgets/textpreview.cpp4
-rw-r--r--src/gui/widgets/window.cpp2
29 files changed, 59 insertions, 59 deletions
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 24c4302f2..9e4438393 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -224,7 +224,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
Image *const image = item->getImage();
if (image)
{
- image->setAlpha(1.0f); // Ensure the image is drawn
+ image->setAlpha(1.0F); // Ensure the image is drawn
// with maximum opacity
g->drawImage(image, box->x + mItemPadding,
box->y + mItemPadding);
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 694010f8b..18cc061b2 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -91,7 +91,7 @@ Gui::Gui(Graphics *const graphics) :
mSecureFont(),
mNpcFont(),
mMouseCursors(nullptr),
- mMouseCursorAlpha(1.0f),
+ mMouseCursorAlpha(1.0F),
mMouseInactivityTimer(0),
mCursorType(Cursor::CURSOR_POINTER),
#ifdef ANDROID
@@ -309,11 +309,11 @@ void Gui::slowLogic()
if (mMouseInactivityTimer < 100 * 15)
{
++mMouseInactivityTimer;
- mMouseCursorAlpha = std::min(1.0f, mMouseCursorAlpha + 0.05f);
+ mMouseCursorAlpha = std::min(1.0F, mMouseCursorAlpha + 0.05F);
}
else
{
- mMouseCursorAlpha = std::max(0.0f, mMouseCursorAlpha - 0.005f);
+ mMouseCursorAlpha = std::max(0.0F, mMouseCursorAlpha - 0.005F);
}
if (mGuiFont)
mGuiFont->slowLogic(0);
@@ -450,7 +450,7 @@ void Gui::draw()
const uint8_t button = SDL_GetMouseState(&mouseX, &mouseY);
if ((client->getMouseFocused() || button & SDL_BUTTON(1))
- && mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0f)
+ && mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F)
{
Graphics *g2 = static_cast<Graphics*>(mGraphics);
const Image *const image = dragDrop.getItemImage();
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index f8b688dee..d36c52e61 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -119,7 +119,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
mRetrieveButton(nullptr),
mInvCloseButton(nullptr),
mWeightBar(nullptr),
- mSlotsBar(new ProgressBar(this, 0.0f, 100, 0, Theme::PROG_INVY_SLOTS)),
+ mSlotsBar(new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_INVY_SLOTS)),
mFilter(nullptr),
mSortModel(new SortListModelInv),
mSortDropDown(new DropDown(this, mSortModel, false, false, this, "sort")),
@@ -209,7 +209,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory):
mShopButton = new Button(this, _("Shop"), "shop", this);
// TRANSLATORS: inventory button
mEquipmentButton = new Button(this, _("Equipment"), "equipment", this);
- mWeightBar = new ProgressBar(this, 0.0f, 100, 0, Theme::PROG_WEIGHT);
+ mWeightBar = new ProgressBar(this, 0.0F, 100, 0, Theme::PROG_WEIGHT);
place(0, 0, mWeightBar, 4);
mSlotsBarCell = &place(4, 0, mSlotsBar, 5);
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index a5e70a30d..d289c1e27 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -241,7 +241,7 @@ void KillStats::gainXp(int xp)
mLine2->setCaption(strprintf(_("Exp: %d/%d Left: %d"), exp,
xpNextLevel, xpNextLevel - exp));
- if (AvgExp >= 0.001f && AvgExp <= 0.001f)
+ if (AvgExp >= 0.001F && AvgExp <= 0.001F)
{
// TRANSLATORS: kill stats window label
mLine3->setCaption(strprintf(_("1%% = %d exp, avg mob for 1%%: %s"),
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 65ba14fc6..01e2c568f 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -461,7 +461,7 @@ void SDLFont::drawString(gcn::Graphics *const graphics,
gcn::Color col = g->getColor();
const gcn::Color &col2 = g->getColor2();
- const float alpha = static_cast<float>(col.a) / 255.0f;
+ const float alpha = static_cast<float>(col.a) / 255.0F;
/* The alpha value is ignored at string generation so avoid caching the
* same text with different alpha values.
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index fcebad81d..2b3f7c697 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -168,11 +168,11 @@ public:
updateAlpha();
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
g->setColor(mHighlightColor);
const int height = getRowHeight();
- mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0f);
+ mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0F);
// Draw filled rectangle around the selected list element
if (mSelected >= 0)
@@ -268,7 +268,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo,
mDir(dir),
mDownloadStatus(DOWNLOADING_UNKNOWN),
mDownload(nullptr),
- mDownloadProgress(-1.0f),
+ mDownloadProgress(-1.0F),
mServerInfo(serverInfo),
mPersistentIPCheckBox(nullptr)
{
@@ -821,10 +821,10 @@ int ServerDialog::downloadUpdate(void *ptr, DownloadStatus status,
if (total)
progress /= static_cast<float>(total);
- if (progress != progress || progress < 0.0f)
+ if (progress != progress || progress < 0.0F)
progress = 0.0f;
- else if (progress > 1.0f)
- progress = 1.0f;
+ else if (progress > 1.0F)
+ progress = 1.0F;
MutexLocker lock1(&sd->mMutex);
sd->mDownloadStatus = DOWNLOADING_IN_PROGRESS;
diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp
index 850068fd9..ca38a76d8 100644
--- a/src/gui/setup_theme.cpp
+++ b/src/gui/setup_theme.cpp
@@ -508,7 +508,7 @@ void Setup_Theme::apply()
if (size >= 0)
mNpcFontSizeDropDown->setSelected(size);
}
- if (mInfo->guiAlpha > 0.01f)
+ if (mInfo->guiAlpha > 0.01F)
config.setValue("guialpha", mInfo->guiAlpha);
}
config.setValue("theme", mTheme);
diff --git a/src/gui/setup_touch.cpp b/src/gui/setup_touch.cpp
index f930c8a8f..1de4686df 100644
--- a/src/gui/setup_touch.cpp
+++ b/src/gui/setup_touch.cpp
@@ -106,22 +106,22 @@ Setup_Touch::Setup_Touch(const Widget2 *const widget) :
"screenButtonsSizeEvent", mSizeList, 100);
// TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 1u), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 1U), "",
"screenActionButton0", this, "screenActionButton0Event",
mActionsList, 250);
// TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 2u), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 2U), "",
"screenActionButton1", this, "screenActionButton1Event",
mActionsList, 250);
// TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 3u), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 3U), "",
"screenActionButton2", this, "screenActionButton2Event",
mActionsList, 250);
// TRANSLATORS: settings option
- new SetupActionDropDown(strprintf(_("Button %u action"), 4u), "",
+ new SetupActionDropDown(strprintf(_("Button %u action"), 4U), "",
"screenActionButton3", this, "screenActionButton3Event",
mActionsList, 250);
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 672928551..94ac10fc6 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -104,7 +104,7 @@ class SkillListBox final : public ListBox
Graphics *const graphics = static_cast<Graphics *const>(
gcnGraphics);
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
// Draw filled rectangle around the selected list element
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 0f00cb95c..767b4f537 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -238,7 +238,7 @@ StatusWindow::StatusWindow() :
mJobLvlLabel = new Label(this, strprintf(_("Job: %d"), 0));
// TRANSLATORS: status window label
mJobLabel = new Label(this, _("Job:"));
- mJobBar = new ProgressBar(this, 0.0f, 80, 0, Theme::PROG_JOB);
+ mJobBar = new ProgressBar(this, 0.0F, 80, 0, Theme::PROG_JOB);
place(3, 0, mJobLvlLabel, 3);
place(5, 2, mJobLabel).setPadding(3);
@@ -512,7 +512,7 @@ void StatusWindow::updateMPBar(ProgressBar *const bar, const bool showMax)
else
bar->setText(toString(mp));
- float prog = 1.0f;
+ float prog = 1.0F;
if (maxMp > 0)
prog = static_cast<float>(mp) / static_cast<float>(maxMp);
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 8f65b6671..f523df908 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -177,7 +177,7 @@ int Skin::getMinHeight() const
Theme::Theme() :
Palette(THEME_COLORS_END * THEME_PALETTES),
mSkins(),
- mMinimumOpacity(-1.0f),
+ mMinimumOpacity(-1.0F),
mProgressColors(ProgressColors(THEME_PROG_END))
{
initDefaultThemePath();
@@ -361,7 +361,7 @@ void Theme::unload(Skin *const skin)
void Theme::setMinimumOpacity(const float minimumOpacity)
{
- if (minimumOpacity > 1.0f)
+ if (minimumOpacity > 1.0F)
return;
mMinimumOpacity = minimumOpacity;
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 3e1c525d7..5ff94ca77 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -56,7 +56,7 @@ struct ThemeInfo final
japanFont(),
fontSize(0),
npcfontSize(0),
- guiAlpha(0.0f)
+ guiAlpha(0.0F)
{
}
std::string name;
@@ -129,7 +129,7 @@ class Skin final
/**
* Updates the alpha value of the skin
*/
- void updateAlpha(const float minimumOpacityAllowed = 0.0f);
+ void updateAlpha(const float minimumOpacityAllowed = 0.0F);
int getPadding() const A_WARN_UNUSED
{ return mPadding; }
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 8b0dab6b3..7eda825ad 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -158,7 +158,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
mUpdatesDirReal(updatesDir),
mCurrentFile("news.txt"),
mNewLabelCaption(),
- mDownloadProgress(0.0f),
+ mDownloadProgress(0.0F),
mDownloadMutex(),
mCurrentChecksum(0),
mStoreInMemory(true),
@@ -451,12 +451,12 @@ int UpdaterWindow::updateProgress(void *ptr, DownloadStatus status,
static_cast<float>(dt);
if (progress != progress)
- progress = 0.0f; // check for NaN
- if (progress < 0.0f)
- progress = 0.0f; // no idea how this could ever happen,
+ progress = 0.0F; // check for NaN
+ if (progress < 0.0F)
+ progress = 0.0F; // no idea how this could ever happen,
// but why not check for it anyway.
- if (progress > 1.0f)
- progress = 1.0f;
+ if (progress > 1.0F)
+ progress = 1.0F;
uw->setLabel(std::string(uw->mCurrentFile).append(" (")
.append(toString(static_cast<int>(progress * 100))).append("%)"));
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index c477b2b3e..61b5f5f6d 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -296,7 +296,7 @@ void Viewport::_drawDebugPath(Graphics *const graphics)
SDL_GetMouseState(&mMouseX, &mMouseY);
static Path debugPath;
- static Vector lastMouseDestination = Vector(0.0f, 0.0f);
+ static Vector lastMouseDestination = Vector(0.0F, 0.0F);
const int mousePosX = mMouseX + mPixelViewX;
const int mousePosY = mMouseY + mPixelViewY;
Vector mouseDestination(mousePosX, mousePosY);
diff --git a/src/gui/widgets/colorpage.cpp b/src/gui/widgets/colorpage.cpp
index 2fb3a50bc..fce2227aa 100644
--- a/src/gui/widgets/colorpage.cpp
+++ b/src/gui/widgets/colorpage.cpp
@@ -52,7 +52,7 @@ void ColorPage::draw(gcn::Graphics *graphics)
mListModel);
Graphics *const g = static_cast<Graphics *const>(graphics);
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
updateAlpha();
gcn::Font *const font = getFont();
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 76ae575de..99438a2ce 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -225,7 +225,7 @@ void DropDown::draw(gcn::Graphics* graphics)
updateAlpha();
- const int alpha = static_cast<int>(mAlpha * 255.0f);
+ const int alpha = static_cast<int>(mAlpha * 255.0F);
const int pad = 2 * mPadding;
mHighlightColor.a = alpha;
mShadowColor.a = alpha;
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 5f1364fc7..115fcb192 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -139,7 +139,7 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
else if (item->isEquipped())
caption = "Eq.";
- image->setAlpha(1.0f);
+ image->setAlpha(1.0F);
g->drawImage(image, itemX, itemY);
if (item->isEquipped())
g->setColorAll(mEquipedColor, mEquipedColor2);
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index cdfafc480..45497ae0a 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -125,7 +125,7 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
if (minY != -1)
{
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
graphics->fillRectangle(gcn::Rectangle(mPadding, minY + mPadding,
width - pad2, maxY - minY + height));
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index 42e68db55..96aabc873 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -308,7 +308,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
const int y = rect.y;
if (mOpaque)
{
- mBackgroundColor.a = static_cast<int>(mAlpha * 255.0f);
+ mBackgroundColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mBackgroundColor);
graphics->fillRectangle(gcn::Rectangle(0, 0, width, height));
}
@@ -359,7 +359,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
if (mSelectedRow > 0)
{
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
if (mLinewiseMode && r == static_cast<unsigned>(
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 5151e44fd..0def0ad9e 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -279,7 +279,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
if (mSelImg)
g->drawImage(mSelImg, itemX, itemY);
}
- image->setAlpha(1.0f); // ensure the image if fully drawn...
+ image->setAlpha(1.0F); // ensure the image if fully drawn...
g->drawImage(image, itemX + mPaddingItemX,
itemY + mPaddingItemY);
if (mProtectedImg && PlayerInfo::isItemProtected(
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 554be07c1..3334a42e5 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -169,7 +169,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
else if (item->isEquipped())
caption = "Eq.";
- image->setAlpha(1.0f);
+ image->setAlpha(1.0F);
g->drawImage(image, itemX, itemY);
if (item->isEquipped())
g->setColorAll(mEquipedColor, mEquipedColor2);
@@ -193,7 +193,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
if (image)
{
- image->setAlpha(1.0f);
+ image->setAlpha(1.0F);
g->drawImage(image, itemX, itemY);
}
}
@@ -212,7 +212,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
if (image)
{
- image->setAlpha(1.0f);
+ image->setAlpha(1.0F);
g->drawImage(image, itemX, itemY);
}
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 0889bac15..4dd1da8d9 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -92,7 +92,7 @@ void ListBox::draw(gcn::Graphics *graphics)
updateAlpha();
Graphics *const g = static_cast<Graphics*>(graphics);
- mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0F);
graphics->setColor(mHighlightColor);
gcn::Font *const font = getFont();
const int rowHeight = getRowHeight();
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index b5af0360d..b0972a314 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -57,8 +57,8 @@ ProgressBar::ProgressBar(const Widget2 *const widget, float progress,
mRedraw(true)
{
// The progress value is directly set at load time:
- if (mProgress > 1.0f || mProgress < 0.0f)
- mProgress = 1.0f;
+ if (mProgress > 1.0F || mProgress < 0.0F)
+ mProgress = 1.0F;
mForegroundColor = getThemeColor(Theme::PROGRESS_BAR);
addWidgetListener(this);
@@ -120,9 +120,9 @@ void ProgressBar::logic()
{
// Smoothly showing the progressbar changes.
if (mProgressToGo > mProgress)
- mProgress = std::min(1.0f, mProgress + 0.005f);
+ mProgress = std::min(1.0F, mProgress + 0.005F);
if (mProgressToGo < mProgress)
- mProgress = std::max(0.0f, mProgress - 0.005f);
+ mProgress = std::max(0.0F, mProgress - 0.005F);
}
BLOCK_END("ProgressBar::logic")
}
@@ -145,7 +145,7 @@ void ProgressBar::draw(gcn::Graphics *graphics)
void ProgressBar::setProgress(const float progress)
{
- const float p = std::min(1.0f, std::max(0.0f, progress));
+ const float p = std::min(1.0F, std::max(0.0F, progress));
mProgressToGo = p;
if (!mSmoothProgress)
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 4d30c015d..e8d8986e7 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -49,7 +49,7 @@ class ProgressBar final : public gcn::Widget,
/**
* Constructor, initializes the progress with the given value.
*/
- ProgressBar(const Widget2 *const widget, float progress = 0.0f,
+ ProgressBar(const Widget2 *const widget, float progress = 0.0F,
const int width = 40, const int height = 7,
const int color = -1);
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index cd83d23db..f719d132e 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -93,7 +93,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
if (client->getGuiAlpha() != mAlpha)
mAlpha = client->getGuiAlpha();
- const int alpha = static_cast<int>(mAlpha * 255.0f);
+ const int alpha = static_cast<int>(mAlpha * 255.0F);
Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
gcn::Font *const font = getFont();
@@ -153,7 +153,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
Image *const icon = item->getImage();
if (icon)
{
- icon->setAlpha(1.0f);
+ icon->setAlpha(1.0F);
graphics->drawImage(icon, mPadding, y + mPadding);
}
}
diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp
index d71b88e85..48ead9c6c 100644
--- a/src/gui/widgets/skillinfo.cpp
+++ b/src/gui/widgets/skillinfo.cpp
@@ -37,7 +37,7 @@
SkillInfo::SkillInfo() :
skillLevel(),
skillExp(),
- progress(0.0f),
+ progress(0.0F),
color(),
dataMap(),
model(nullptr),
@@ -101,7 +101,7 @@ void SkillInfo::update()
else
{
skillExp.clear();
- progress = 0.0f;
+ progress = 0.0F;
}
color = Theme::getProgressColor(Theme::PROG_EXP, progress);
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 4319bd145..cf3fc937b 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -130,7 +130,7 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
if (image)
{
- image->setAlpha(1.0f);
+ image->setAlpha(1.0F);
g->drawImage(image, itemX, itemY);
}
}
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp
index f78c48894..bb31993bd 100644
--- a/src/gui/widgets/textpreview.cpp
+++ b/src/gui/widgets/textpreview.cpp
@@ -86,7 +86,7 @@ void TextPreview::draw(gcn::Graphics* graphics)
mAlpha = client->getGuiAlpha();
Graphics *const g = static_cast<Graphics*>(graphics);
- const int intAlpha = static_cast<int>(mAlpha * 255.0f);
+ const int intAlpha = static_cast<int>(mAlpha * 255.0F);
const int alpha = mTextAlpha ? intAlpha : 255;
if (mOpaque)
@@ -94,7 +94,7 @@ void TextPreview::draw(gcn::Graphics* graphics)
g->setColor(gcn::Color(static_cast<int>(mBGColor->r),
static_cast<int>(mBGColor->g),
static_cast<int>(mBGColor->b),
- static_cast<int>(mAlpha * 255.0f)));
+ static_cast<int>(mAlpha * 255.0F)));
g->fillRectangle(gcn::Rectangle(0, 0,
mDimension.width, mDimension.height));
}
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 8733bb737..12e2f74dd 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -1114,7 +1114,7 @@ int Window::getGuiAlpha() const
{
const float alpha = std::max(client->getGuiAlpha(),
Theme::instance()->getMinimumOpacity());
- return static_cast<int>(alpha * 255.0f);
+ return static_cast<int>(alpha * 255.0F);
}
Layout &Window::getLayout()