diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-02 20:35:41 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-02 20:35:41 +0200 |
| commit | 31010d6d3ba6600860a9f6dd925ac3d8e3f2c830 (patch) | |
| tree | 88e0c06f16f00e635860f1ecc7d65d8e0cf4d1de /src/playerrelations.cpp | |
| parent | bbb4c1c61863b9032af2291bff20814733995391 (diff) | |
| parent | 9015268746ed9052a9dc83839b2834b5feeab166 (diff) | |
| download | mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.gz mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.bz2 mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.tar.xz mana-client-31010d6d3ba6600860a9f6dd925ac3d8e3f2c830.zip | |
Merge branch '0.6'
Diffstat (limited to 'src/playerrelations.cpp')
| -rw-r--r-- | src/playerrelations.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 89cd7250..47bc1913 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -31,8 +31,7 @@ #include "utils/gettext.h" #define PLAYER_IGNORE_STRATEGY_NOP "nop" -#define PLAYER_IGNORE_STRATEGY_EMOTE0 "emote0" -#define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_EMOTE0 +#define DEFAULT_IGNORE_STRATEGY PLAYER_IGNORE_STRATEGY_NOP #define NAME "name" // constant for xml serialisation #define RELATION "relation" // constant for xml serialisation |