diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-06-20 00:15:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-06-20 00:15:42 +0300 |
| commit | f96919885dd0e5ae0de4a8517e76419304ca8d36 (patch) | |
| tree | 2c39f6da9bd97c45d77c77f1b9ee0505f38be0e6 /src/being | |
| parent | 1dbf1cf1d87a38a327673b69c184ad662bd12cc4 (diff) | |
| download | mv-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.gz mv-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.bz2 mv-f96919885dd0e5ae0de4a8517e76419304ca8d36.tar.xz mv-f96919885dd0e5ae0de4a8517e76419304ca8d36.zip | |
Fix code style.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/being/being.h | 2 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 2 | ||||
| -rw-r--r-- | src/being/playerrelations.h | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 7688a300d..27544496d 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -2130,7 +2130,7 @@ void Being::updateColors() } else if (player_relations.getRelation(mName) == Relation::IGNORED || - player_relations.getRelation(mName)== Relation::ENEMY2) + player_relations.getRelation(mName) == Relation::ENEMY2) { mNameColor = &userPalette->getColor(UserColorId::IGNORED); } diff --git a/src/being/being.h b/src/being/being.h index 521a554cf..e957228c2 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -1075,7 +1075,7 @@ class Being notfinal : public ActorSprite, int mHP; int mMaxHP; int mDistance; - ReachableT mReachable; /**< 0 - unknown, 1 - reachable, 2 - not reachable*/ + ReachableT mReachable; int mGoodStatus; static int mUpdateConfigTime; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 52201e7fb..1e75865a6 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -46,7 +46,6 @@ #include "input/keyboardconfig.h" -#include "gui/chatconsts.h" #include "gui/gui.h" #include "gui/userpalette.h" #include "gui/popupmanager.h" @@ -60,7 +59,6 @@ #include "gui/windows/statuswindow.h" #include "gui/windows/updaterwindow.h" -#include "gui/widgets/tabs/chat/gmtab.h" #include "gui/widgets/tabs/chat/whispertab.h" #include "net/beinghandler.h" diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h index 62244c5ea..7ead62777 100644 --- a/src/being/playerrelations.h +++ b/src/being/playerrelations.h @@ -34,9 +34,10 @@ class Being; class PlayerIgnoreStrategy; -class PlayerRelation; class PlayerRelationsListener; +struct PlayerRelation; + /** * Player relations class, represents any particular relations and/or * preferences the user of the local client has wrt other players (identified |