summaryrefslogtreecommitdiff
path: root/src/player_relations.h
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-13 21:33:06 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-04-13 21:35:19 +0200
commit28bc8c0edb549cdbbe0832c4202630a039f738b1 (patch)
tree9989f31a5121f82af5aa264ebfe7096c5ea5030f /src/player_relations.h
parent627e1bc7eee5b821d29b2161dec4991cae7bf9c0 (diff)
downloadmana-28bc8c0edb549cdbbe0832c4202630a039f738b1.tar.gz
mana-28bc8c0edb549cdbbe0832c4202630a039f738b1.tar.bz2
mana-28bc8c0edb549cdbbe0832c4202630a039f738b1.tar.xz
mana-28bc8c0edb549cdbbe0832c4202630a039f738b1.zip
Some cleanup of the Configuration interface
Mainly avoid all the convertions from integer to float and then to string and also back from string to float and then to integer.
Diffstat (limited to 'src/player_relations.h')
-rw-r--r--src/player_relations.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player_relations.h b/src/player_relations.h
index a6c6a115..adc6a95f 100644
--- a/src/player_relations.h
+++ b/src/player_relations.h
@@ -46,16 +46,16 @@ struct PlayerRelation
| SPEECH_LOG
| WHISPER
| TRADE;
- enum relation {
+ enum Relation {
NEUTRAL = 0,
FRIEND = 1,
DISREGARDED = 2,
IGNORED = 3
};
- PlayerRelation(relation relation);
+ PlayerRelation(Relation relation);
- relation mRelation; // bitmask for all of the above
+ Relation mRelation; // bitmask for all of the above
};
@@ -131,12 +131,12 @@ public:
* Updates the relationship with this player.
*/
void setRelation(const std::string &name,
- PlayerRelation::relation relation);
+ PlayerRelation::Relation relation);
/**
* Updates the relationship with this player.
*/
- PlayerRelation::relation getRelation(const std::string &name);
+ PlayerRelation::Relation getRelation(const std::string &name);
/**
* Deletes the information recorded for a player.