summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-13 19:10:50 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-13 21:20:33 +0300
commitfcf1da7a161c3e18d393a9b998effc6aa1c366b9 (patch)
tree5f92a8a168dd0748903cc90620a00c7c7bd29377 /src/gui
parentcd0baf3217701134a8e61932fd14c39cec0cf242 (diff)
downloadManaVerse-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.gz
ManaVerse-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.bz2
ManaVerse-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.tar.xz
ManaVerse-fcf1da7a161c3e18d393a9b998effc6aa1c366b9.zip
fix code style.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/setup_players.cpp4
-rw-r--r--src/gui/setup_video.cpp2
-rw-r--r--src/gui/shopwindow.h1
-rw-r--r--src/gui/widgets/extendedlistbox.cpp2
-rw-r--r--src/gui/widgets/itemcontainer.cpp3
-rw-r--r--src/gui/widgets/textfield.cpp4
7 files changed, 11 insertions, 7 deletions
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 7d19da293..b3cff3087 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -204,6 +204,8 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) :
mFPSText = _("%d FPS (Software)");
break;
case RENDER_NORMAL_OPENGL:
+ case RENDER_NULL:
+ case RENDER_LAST:
default:
// TRANSLATORS: debug window label
mFPSText = _("%d FPS (fast OpenGL)");
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 69a395b4c..928f9952d 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -97,8 +97,8 @@ Setup_Players::Setup_Players(const Widget2 *const widget) :
"hideErased", this, "hideErasedEvent");
// TRANSLATORS: settings option
- new SetupItemCheckBox(_("Use special diagonal speed in players moving"), "",
- "useDiagonalSpeed", this, "useDiagonalSpeedEvent");
+ new SetupItemCheckBox(_("Use special diagonal speed in players moving"),
+ "", "useDiagonalSpeed", this, "useDiagonalSpeedEvent");
setDimension(gcn::Rectangle(0, 0, 550, 350));
}
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index b04bf7681..b82b25f25 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -565,7 +565,7 @@ void Setup_Video::action(const gcn::ActionEvent &event)
{
const int val = test->getConfig().getValueInt("opengl", -1);
if (val >= 0 && static_cast<unsigned int>(val)
- < sizeof(renderToIndex))
+ < sizeof(renderToIndex) / sizeof (int))
{
mOpenGLDropDown->setSelected(renderToIndex[val]);
}
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 4bcf139cb..7e33416e9 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -32,7 +32,6 @@ class Button;
class CheckBox;
class Item;
class Label;
-//class ListBox;
class ScrollArea;
class ShopItem;
class ShopItems;
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 4cf3153b1..cdfafc480 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -165,8 +165,6 @@ void ExtendedListBox::draw(gcn::Graphics *graphics)
}
}
-
-
for (int f = 0; f < selSz; ++f)
{
const ExtendedListBoxItem &item = mSelectedItems[f];
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index a69716f75..5151e44fd 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -282,7 +282,8 @@ void ItemContainer::draw(gcn::Graphics *graphics)
image->setAlpha(1.0f); // ensure the image if fully drawn...
g->drawImage(image, itemX + mPaddingItemX,
itemY + mPaddingItemY);
- if (mProtectedImg && PlayerInfo::isItemProtected(item->getId()))
+ if (mProtectedImg && PlayerInfo::isItemProtected(
+ item->getId()))
{
g->drawImage(mProtectedImg, itemX + mPaddingItemX,
itemY + mPaddingItemY);
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 022a20781..9390e3a24 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -24,6 +24,10 @@
#include "client.h"
+#ifdef ANDROID
+#include "input/inputmanager.h"
+#endif
+
#include "input/keydata.h"
#include "input/keyevent.h"