From 2af5e3f72aef14b5b541b7c47878e0a13a343b85 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 16 Sep 2011 03:19:47 +0300
Subject: Fix code style.

---
 src/being.cpp           | 4 ++--
 src/gui/statuspopup.cpp | 2 --
 src/localplayer.cpp     | 5 +----
 src/openglgraphics.cpp  | 6 ++++--
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src')

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)
             {
-- 
cgit v1.2.3-70-g09d2