summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-16 03:19:47 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-16 03:19:47 +0300
commit2af5e3f72aef14b5b541b7c47878e0a13a343b85 (patch)
tree2321c64133686081c18ea738c5c2131d0e02951f
parent6ac937583f9589e7049f2eb51eca62f2249ba7d6 (diff)
downloadmv-2af5e3f72aef14b5b541b7c47878e0a13a343b85.tar.gz
mv-2af5e3f72aef14b5b541b7c47878e0a13a343b85.tar.bz2
mv-2af5e3f72aef14b5b541b7c47878e0a13a343b85.tar.xz
mv-2af5e3f72aef14b5b541b7c47878e0a13a343b85.zip
Fix code style.
-rw-r--r--src/being.cpp4
-rw-r--r--src/gui/statuspopup.cpp2
-rw-r--r--src/localplayer.cpp5
-rw-r--r--src/openglgraphics.cpp6
4 files changed, 7 insertions, 10 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 73e1819a0..86695ee61 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1409,8 +1409,8 @@ void Being::drawSpeech(int offsetX, int offsetY)
if (!mText && userPalette)
{
mText = new Text(mSpeech, getPixelX(), getPixelY() - getHeight(),
- gcn::Graphics::CENTER, &userPalette->getColor(UserPalette::PARTICLE),
- true);
+ gcn::Graphics::CENTER, &userPalette->getColor(
+ UserPalette::PARTICLE), true);
}
}
else if (speech == NO_SPEECH)
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 13b5d575e..fee6450df 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -157,8 +157,6 @@ void StatusPopup::update()
minWidth += 16 + 2 * getPadding();
setWidth(minWidth);
- const int fontHeight = getFont()->getHeight();
-
setHeight(mDisableGameModifiers->getY()
+ mDisableGameModifiers->getHeight() + 2 * getPadding());
}
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 8105f3291..e17cf09c4 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -350,11 +350,8 @@ void LocalPlayer::logic()
if (mEnableAdvert && !mBlockAdvert && mAdvertTime < cur_time)
{
Uint8 smile = FLAG_SPECIAL;
- if (mTradebot && shopWindow && shopWindow
- && !shopWindow->isShopEmpty())
- {
+ if (mTradebot && shopWindow && !shopWindow->isShopEmpty())
smile += FLAG_SHOP;
- }
if (mAwayMode)
smile += FLAG_AWAY;
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index b67d4b2be..2ec5db490 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -529,7 +529,8 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image,
for (int py = 0; py < h; py += scaledHeight)
{
- const int height = (py + scaledHeight >= h) ? h - py : scaledHeight;
+ const int height = (py + scaledHeight >= h)
+ ? h - py : scaledHeight;
const int dstY = y + py;
for (int px = 0; px < w; px += scaledWidth)
{
@@ -583,7 +584,8 @@ void OpenGLGraphics::drawRescaledImagePattern(Image *image,
for (int py = 0; py < h; py += scaledHeight)
{
- const int height = (py + scaledHeight >= h) ? h - py : scaledHeight;
+ const int height = (py + scaledHeight >= h)
+ ? h - py : scaledHeight;
const int dstY = y + py;
for (int px = 0; px < w; px += scaledWidth)
{