diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-01-18 14:18:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-01-18 14:18:44 +0300 |
| commit | 9e2627c8ea1b43b5b3446983c01cf68d9edb6e77 (patch) | |
| tree | 8059fbea87417b7d5529310939a351f32db900f3 | |
| parent | a9e647742118cb4e46ae5ac1d0f3ee2b8fdcf3fc (diff) | |
| download | manaplus-9e2627c8ea1b43b5b3446983c01cf68d9edb6e77.tar.gz manaplus-9e2627c8ea1b43b5b3446983c01cf68d9edb6e77.tar.bz2 manaplus-9e2627c8ea1b43b5b3446983c01cf68d9edb6e77.tar.xz manaplus-9e2627c8ea1b43b5b3446983c01cf68d9edb6e77.zip | |
Fix code style.
| -rw-r--r-- | src/actionmanager.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windowmenu.cpp | 2 | ||||
| -rw-r--r-- | src/touchmanager.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index f1470b797..d7e0f361c 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -946,7 +946,7 @@ impHandler0(talk) if (target) { if (abs(target->getTileX() - player_node->getTileX()) > 1 - || abs(target->getTileY() - player_node->getTileY()) > 1) + || abs(target->getTileY() - player_node->getTileY()) > 1) { return true; } diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 18c025d3f..2d8ec7f7a 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -69,7 +69,7 @@ WindowMenu::WindowMenu(const Widget2 *const widget) : gcn::SelectionListener(), gcn::MouseListener(), mSkin(Theme::instance() ? Theme::instance()->load("windowmenu.xml", "") - : nullptr), + : nullptr), mPadding(mSkin ? mSkin->getPadding() : 1), mSpacing(mSkin ? mSkin->getOption("spacing", 3) : 3), mTextPopup(new TextPopup), diff --git a/src/touchmanager.cpp b/src/touchmanager.cpp index f42d23368..c8d813998 100644 --- a/src/touchmanager.cpp +++ b/src/touchmanager.cpp @@ -378,8 +378,8 @@ void TouchManager::loadButtons() // 2x1 if (mButtonsFormat == 0) { - loadTouchItem(&mButtons[1], "dbutton.xml", "dbutton_image.xml", x, y, - sz, sz, RIGHT, "screenActionButton1", ""); + loadTouchItem(&mButtons[1], "dbutton.xml", "dbutton_image.xml", + x, y, sz, sz, RIGHT, "screenActionButton1", ""); loadTouchItem(&mButtons[0], "dbutton.xml", "dbutton_image.xml", skipWidth, y, sz, sz, RIGHT, "screenActionButton0", ""); @@ -387,8 +387,8 @@ void TouchManager::loadButtons() // 2x2 else if (mButtonsFormat == 1) { - loadTouchItem(&mButtons[3], "dbutton.xml", "dbutton_image.xml", x, y, - sz, sz, RIGHT, "screenActionButton3", ""); + loadTouchItem(&mButtons[3], "dbutton.xml", "dbutton_image.xml", + x, y, sz, sz, RIGHT, "screenActionButton3", ""); loadTouchItem(&mButtons[2], "dbutton.xml", "dbutton_image.xml", skipWidth, y, sz, sz, RIGHT, "screenActionButton2", ""); |