flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed basic style violations.

Browse Source
This commit is contained in:
Mattes D 2014-08-27 15:13:13 +03:00
parent bc44b96059
commit d8527c5429
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/LoggerListeners.cpp
View File

@ -65,7 +65,7 @@
{ {
case cLogger::llRegular: case cLogger::llRegular:
{ {
// Gray on black // Gray on black
Attrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED; Attrib = FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
break; break;
} }
@ -93,7 +93,7 @@
virtual void SetDefaultLogColour() override virtual void SetDefaultLogColour() override
{ {
SetConsoleTextAttribute(m_Console, m_DefaultConsoleAttrib); SetConsoleTextAttribute(m_Console, m_DefaultConsoleAttrib);
} }
@ -119,13 +119,13 @@
{ {
case cLogger::llRegular: case cLogger::llRegular:
{ {
// Whatever the console default is // Whatever the console default is
printf("\x1b[0m"); printf("\x1b[0m");
break; break;
} }
case cLogger::llInfo: case cLogger::llInfo:
{ {
// Yellow on black // Yellow on black
printf("\x1b[33;1m"); printf("\x1b[33;1m");
break; break;
} }
@ -133,7 +133,7 @@
{ {
// Red on black // Red on black
printf("\x1b[31;1m"); printf("\x1b[31;1m");
break; break;
} }
case cLogger::llError: case cLogger::llError:
{ {
@ -147,7 +147,7 @@
virtual void SetDefaultLogColour() override virtual void SetDefaultLogColour() override
{ {
// Whatever the console default is // Whatever the console default is
printf("\x1b[0m"); printf("\x1b[0m");
} }
}; };

10
src/RankManager.cpp
View File

@ -125,7 +125,7 @@ protected:
/** Maps lists of groups to rank names. /** Maps lists of groups to rank names.
Each group list is either a simple "<Group>" if there's only one group, Each group list is either a simple "<Group>" if there's only one group,
or "<PrimaryGroup>,<FirstSecondaryGroup>,<SecondSecondaryGroup>...", where the secondary groups are or "<PrimaryGroup>, <FirstSecondaryGroup>, <SecondSecondaryGroup>...", where the secondary groups are
lowercased and alpha-sorted. This makes the group lists comparable for equivalence, simply by comparing lowercased and alpha-sorted. This makes the group lists comparable for equivalence, simply by comparing
their string names. their string names.
The ranks are named "<Group>" for single-group players, and "AutoMigratedRank_N" for the composite ranks, The ranks are named "<Group>" for single-group players, and "AutoMigratedRank_N" for the composite ranks,
@ -507,10 +507,8 @@ AStringVector cRankManager::GetPlayerGroups(const AString & a_PlayerUUID)
// Prepare the DB statement: // Prepare the DB statement:
SQLite::Statement stmt(m_DB, SQLite::Statement stmt(m_DB,
"SELECT PermGroup.Name FROM PermGroup " "SELECT PermGroup.Name FROM PermGroup "
"LEFT JOIN RankPermGroup " "LEFT JOIN RankPermGroup ON PermGroup.PermGroupID = RankPermGroup.PermGroupID "
"ON PermGroup.PermGroupID = RankPermGroup.PermGroupID " "LEFT JOIN PlayerRank ON PlayerRank.RankID = RankPermGroup.RankID "
"LEFT JOIN PlayerRank "
"ON PlayerRank.RankID = RankPermGroup.RankID "
"WHERE PlayerRank.PlayerUUID = ?" "WHERE PlayerRank.PlayerUUID = ?"
); );
stmt.bind(1, a_PlayerUUID); stmt.bind(1, a_PlayerUUID);
@ -1473,7 +1471,7 @@ void cRankManager::RemovePlayerRank(const AString & a_PlayerUUID)
stmt.bind(1, a_PlayerUUID); stmt.bind(1, a_PlayerUUID);
stmt.exec(); stmt.exec();
} }
catch(const SQLite::Exception & ex) catch (const SQLite::Exception & ex)
{ {
LOGWARNING("%s: Failed to remove rank from player UUID %s: %s", LOGWARNING("%s: Failed to remove rank from player UUID %s: %s",
__FUNCTION__, a_PlayerUUID.c_str(), ex.what() __FUNCTION__, a_PlayerUUID.c_str(), ex.what()