diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/playerrelations.h | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | manaplus-stripped1.1.10.16.tar.gz manaplus-stripped1.1.10.16.tar.bz2 manaplus-stripped1.1.10.16.tar.xz manaplus-stripped1.1.10.16.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/playerrelations.h')
| -rw-r--r-- | src/playerrelations.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/playerrelations.h b/src/playerrelations.h index bb483a793..41ca14b40 100644 --- a/src/playerrelations.h +++ b/src/playerrelations.h @@ -44,8 +44,9 @@ struct PlayerRelation static const unsigned int WHISPER = (1 << 3); 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 RELATIONS_NR = 5; + static const unsigned int RELATIONS_NR = 6; static const unsigned int RELATION_PERMISSIONS[RELATIONS_NR]; static const unsigned int DEFAULT = EMOTE @@ -59,7 +60,8 @@ struct PlayerRelation FRIEND = 1, DISREGARDED = 2, IGNORED = 3, - ERASED = 4 + ERASED = 4, + BLACKLISTED = 5 }; PlayerRelation(Relation relation); |