summaryrefslogtreecommitdiff
path: root/src/being/playerrelation.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-30 17:45:27 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-30 17:45:27 +0300
commitaadf40739c45c3396ace5766dd9c60db0c3b1ccc (patch)
treea6d2ca5fb86849ae18586b728bfcd9e716f5635f /src/being/playerrelation.h
parent2a33b736dc93251bf7a72364c5f818142362a3ce (diff)
downloadmv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.gz
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.bz2
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.tar.xz
mv-aadf40739c45c3396ace5766dd9c60db0c3b1ccc.zip
Move relation enum into separate file.
Diffstat (limited to 'src/being/playerrelation.h')
-rw-r--r--src/being/playerrelation.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/being/playerrelation.h b/src/being/playerrelation.h
index 5f6e1f42d..22fb3cb64 100644
--- a/src/being/playerrelation.h
+++ b/src/being/playerrelation.h
@@ -23,6 +23,8 @@
#ifndef BEING_PLAYERRELATION_H
#define BEING_PLAYERRELATION_H
+#include "enums/being/relation.h"
+
#include "localconsts.h"
struct PlayerRelation final
@@ -44,22 +46,12 @@ struct PlayerRelation final
| SPEECH_LOG
| WHISPER
| TRADE;
- enum Relation
- {
- NEUTRAL = 0,
- FRIEND = 1,
- DISREGARDED = 2,
- IGNORED = 3,
- ERASED = 4,
- BLACKLISTED = 5,
- ENEMY2 = 6
- };
- explicit PlayerRelation(const Relation relation);
+ explicit PlayerRelation(const RelationT relation);
A_DELETE_COPY(PlayerRelation)
- Relation mRelation; // bitmask for all of the above
+ RelationT mRelation; // bitmask for all of the above
};
#endif // BEING_PLAYERRELATION_H