summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-15 23:21:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-15 23:21:52 +0300
commitde5b0753bd94e014f0e81fc676b21c251aabd326 (patch)
tree8d0e306c83bb72eb500e34fa41e6d10918544739 /src/being
parent1e59c7e61474e89e08dcb40134d8be5f5ae76bf4 (diff)
downloadmv-de5b0753bd94e014f0e81fc676b21c251aabd326.tar.gz
mv-de5b0753bd94e014f0e81fc676b21c251aabd326.tar.bz2
mv-de5b0753bd94e014f0e81fc676b21c251aabd326.tar.xz
mv-de5b0753bd94e014f0e81fc676b21c251aabd326.zip
Fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp5
-rw-r--r--src/being/playerrelations.cpp1
-rw-r--r--src/being/playerrelations.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 8be720f13..bf17a2a23 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2107,8 +2107,9 @@ void Being::updateColors()
{
mNameColor = &userPalette->getColor(UserColorId::DISREGARDED);
}
- else if (player_relations.getRelation(mName) == Relation::IGNORED
- || player_relations.getRelation(mName) == Relation::ENEMY2)
+ else if (player_relations.getRelation(mName)
+ == Relation::IGNORED ||
+ player_relations.getRelation(mName)== Relation::ENEMY2)
{
mNameColor = &userPalette->getColor(UserColorId::IGNORED);
}
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 2ebaf3f2f..bdb7c08c2 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -28,6 +28,7 @@
#include "being/localplayer.h"
#include "being/playerignorestrategy.h"
+#include "being/playerrelation.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index 5f7e6e2a4..62244c5ea 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -25,7 +25,7 @@
#include "utils/stringvector.h"
-#include "being/playerrelation.h"
+#include "enums/being/relation.h"
#include <list>
#include <map>
@@ -34,6 +34,7 @@
class Being;
class PlayerIgnoreStrategy;
+class PlayerRelation;
class PlayerRelationsListener;
/**