diff options
Diffstat (limited to 'src/playerrelations.h')
| -rw-r--r-- | src/playerrelations.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/playerrelations.h b/src/playerrelations.h index 41ca14b40..5fabb3d0e 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -45,8 +45,9 @@ struct PlayerRelation static const unsigned int TRADE = (1 << 4); static const unsigned int INVISIBLE = (1 << 5); static const unsigned int BLACKLIST = (1 << 6); + static const unsigned int ENEMY = (1 << 7); - static const unsigned int RELATIONS_NR = 6; + static const unsigned int RELATIONS_NR = 7; static const unsigned int RELATION_PERMISSIONS[RELATIONS_NR]; static const unsigned int DEFAULT = EMOTE @@ -61,7 +62,8 @@ struct PlayerRelation DISREGARDED = 2, IGNORED = 3, ERASED = 4, - BLACKLISTED = 5 + BLACKLISTED = 5, + ENEMY2 = 6 }; PlayerRelation(Relation relation); @@ -180,7 +182,7 @@ class PlayerRelationsManager /** * Return the current player ignore strategy. * - * \return A player ignore strategy, or NULL + * \return A player ignore strategy, or nullptr */ PlayerIgnoreStrategy *getPlayerIgnoreStrategy() const { return mIgnoreStrategy; } @@ -237,6 +239,7 @@ class PlayerRelationsManager void removeListener(PlayerRelationsListener *listener) { mListeners.remove(listener); } + bool checkBadRelation(std::string name); private: void signalUpdate(const std::string &name); |