diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-01 22:13:39 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-02 20:24:42 +0200 |
| commit | 9015268746ed9052a9dc83839b2834b5feeab166 (patch) | |
| tree | 6516c0acb2833e27bd3911672a68d0117b818739 /src/playerrelations.cpp | |
| parent | 4c7ff677593ea5a56326ec5a43814291f36bd452 (diff) | |
| download | mana-9015268746ed9052a9dc83839b2834b5feeab166.tar.gz mana-9015268746ed9052a9dc83839b2834b5feeab166.tar.bz2 mana-9015268746ed9052a9dc83839b2834b5feeab166.tar.xz mana-9015268746ed9052a9dc83839b2834b5feeab166.zip | |
Fixed problems with using the last emotev0.6.1
The tmwa/BeingHandler was adjusting the effect id rather than the emote
id, causing it to not find the last emote (and the rest of the emotes
only worked correctly because the effect ids were consecutive in the same
order as the emote ids).
Furthermore, the EmoteShortcutContainer refused to draw the icon for the
last emote due to an off-by-one error in dealing with the 1-adjusted
emote ids used by the EmoteShortcut class.
Also cleaned up some old remains of a player ignore strategy that used
to use the two balloon emotes (this had been their original purpose).
Reviewed-by: Erik Schilling
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 |