diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-13 04:57:16 +0300 |
| commit | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (patch) | |
| tree | c1edb8d8b368fdd43cd8639e6044b0f4e8dde70a /src/playerrelations.h | |
| parent | ece00592ecd93f7a96db0ca82589d00846e2f938 (diff) | |
| parent | d471e99fd38ac589a8a9e8e8677b9f577f0cc5c6 (diff) | |
| download | manaverse-stripped1.1.11.12.tar.gz manaverse-stripped1.1.11.12.tar.bz2 manaverse-stripped1.1.11.12.tar.xz manaverse-stripped1.1.11.12.zip | |
Merge branch 'master' into strippedstripped1.1.11.12
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/focushandler.cpp
src/guichan/graphics.cpp
src/guichan/gui.cpp
src/guichan/image.cpp
src/guichan/include/guichan/widgets/checkbox.hpp
src/guichan/include/guichan/widgets/dropdown.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widget.cpp
src/guichan/widgets/dropdown.cpp
src/guichan/widgets/icon.cpp
src/guichan/widgets/imagebutton.cpp
src/guichan/widgets/listbox.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/tab.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
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); |