From f542aea53d4e32ba0a97a216f9dbfc870c96fc3d Mon Sep 17 00:00:00 2001 From: hiker Date: Fri, 27 Feb 2015 22:33:03 +1100 Subject: [PATCH] Fixed line endings style. --- src/main.cpp | 20 ++++++++++---------- src/states_screens/user_screen.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 3ee1bdb09..d9557221b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -402,16 +402,16 @@ bool isEasterMode(int day, int month, int year, int before_after_days) { // Compute Easter date, based on wikipedia formula // http://en.wikipedia.org/wiki/Computus - int a = year % 19; - int b = year >> 2; - int c = int(floor(b / 25)) + 1; - int d = (c * 3) >> 2; - int e = ((a * 19) - int(floor((c * 8 + 5) / 25)) + d + 15) % 30; - e += (29578 - a - e * 32) >> 10; - e -= ((year % 7) + b - d + e + 2) % 7; - d = e >> 5; - int easter_day = e - d * 31; - int easter_month = d + 3; + int a = year % 19; + int b = year >> 2; + int c = int(floor(b / 25)) + 1; + int d = (c * 3) >> 2; + int e = ((a * 19) - int(floor((c * 8 + 5) / 25)) + d + 15) % 30; + e += (29578 - a - e * 32) >> 10; + e -= ((year % 7) + b - d + e + 2) % 7; + d = e >> 5; + int easter_day = e - d * 31; + int easter_month = d + 3; int easter_start_day = easter_day - before_after_days; int easter_start_month = easter_month; diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/user_screen.cpp index b72f00259..2f12a5c99 100644 --- a/src/states_screens/user_screen.cpp +++ b/src/states_screens/user_screen.cpp @@ -281,8 +281,8 @@ void BaseUserScreen::makeEntryFieldsVisible() getWidget("label_password")->setVisible(online); m_password_tb->setVisible(online); // Is user has no online name, make sure the user can enter one - if (player->getLastOnlineName().empty()) - m_username_tb->setActivated(); + if (player->getLastOnlineName().empty()) + m_username_tb->setActivated(); } } // makeEntryFieldsVisible