summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-28 13:47:32 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-28 13:47:32 +0300
commitfbcfa27edf518835976e140ec160db009186bc16 (patch)
tree52e2999ffe9ba3971f2b4334be7c8c42754a7e03 /src/gui
parentcaf62e4d1c039f8d4d33bfd05f476890fdc79fcf (diff)
downloadmanaverse-fbcfa27edf518835976e140ec160db009186bc16.tar.gz
manaverse-fbcfa27edf518835976e140ec160db009186bc16.tar.bz2
manaverse-fbcfa27edf518835976e140ec160db009186bc16.tar.xz
manaverse-fbcfa27edf518835976e140ec160db009186bc16.zip
Fix code style and add some checks.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/chatwindow.cpp5
-rw-r--r--src/gui/setup.cpp4
-rw-r--r--src/gui/setup_perfomance.cpp9
-rw-r--r--src/gui/viewport.cpp2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index c33478cc5..bc8bd1f83 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -858,8 +858,9 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event)
}
unsigned int f = 0;
- for (std::list<std::string>::const_iterator it = tab->getRows().begin(),
- it_end = tab->getRows().end(); it != it_end; ++it, f++)
+ for (std::list<std::string>::const_iterator
+ it = tab->getRows().begin(), it_end = tab->getRows().end();
+ it != it_end; ++it, f++)
{
if (f == mChatHistoryIndex)
mChatInput->setText(*it);
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 9f7ae209d..b0d2f4ec0 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -182,8 +182,8 @@ void Setup::setInGame(bool inGame)
void Setup::externalUpdate()
{
- for (std::list<SetupTab*>::const_iterator it = mTabs.begin(), it_end = mTabs.end();
- it != it_end; ++ it)
+ for (std::list<SetupTab*>::const_iterator it = mTabs.begin(),
+ it_end = mTabs.end(); it != it_end; ++ it)
{
if (*it)
(*it)->externalUpdated();
diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp
index 285c2baab..a40a400f3 100644
--- a/src/gui/setup_perfomance.cpp
+++ b/src/gui/setup_perfomance.cpp
@@ -90,15 +90,14 @@ Setup_Perfomance::Setup_Perfomance()
"disableBeingCaching", this, "disableBeingCachingEvent");
- new SetupItemLabel(_("Different options (enable or disable can improve perfomance)"),
- "", this);
+ new SetupItemLabel(_("Different options (enable or disable can "
+ "improve perfomance)"), "", this);
new SetupItemCheckBox(_("Enable texture compression (fast OpenGL)"), "",
"compresstextures", this, "compresstexturesEvent");
- new SetupItemCheckBox(_("Enable rectangular texture extension (OpenGL)"), "",
- "rectangulartextures", this, "rectangulartexturesEvent");
-
+ new SetupItemCheckBox(_("Enable rectangular texture extension (OpenGL)"),
+ "", "rectangulartextures", this, "rectangulartexturesEvent");
setDimension(gcn::Rectangle(0, 0, 550, 350));
}
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index d07f80e1c..65ca8071c 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -196,7 +196,7 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
// if (debugChatTab)
// debugChatTab->chatLog("incorrect player position!");
logger->log("incorrect player position: %d, %d, %d, %d",
- player_x, player_y, mPixelViewX,mPixelViewY);
+ player_x, player_y, mPixelViewX, mPixelViewY);
if (player_node)
{
logger->log("tile position: %d, %d",