diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 21:59:21 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 22:00:09 +0100 |
| commit | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch) | |
| tree | 03c296d1f89859aae35336dfe2f58df09d256fd3 /src/player_relations.cpp | |
| parent | fa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff) | |
| parent | 347452b9b69ef3af29c577b7751082822e900c01 (diff) | |
| download | mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2 mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz mana-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip | |
Merge branch 'aethyra/master'
Conflicts:
Many files.
Diffstat (limited to 'src/player_relations.cpp')
| -rw-r--r-- | src/player_relations.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/player_relations.cpp b/src/player_relations.cpp index 14df3f01..ef2ef1bc 100644 --- a/src/player_relations.cpp +++ b/src/player_relations.cpp @@ -354,14 +354,15 @@ private: std::vector<PlayerIgnoreStrategy *> * PlayerRelationsManager::getPlayerIgnoreStrategies() { - if (mIgnoreStrategies.size() == 0) { + if (mIgnoreStrategies.size() == 0) + { // not initialised yet? mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE, - "floating '...' bubble", - PLAYER_IGNORE_STRATEGY_EMOTE0)); + "floating '...' bubble", + PLAYER_IGNORE_STRATEGY_EMOTE0)); mIgnoreStrategies.push_back(new PIS_emote(FIRST_IGNORE_EMOTE + 1, - "floating bubble", - "emote1")); + "floating bubble", + "emote1")); mIgnoreStrategies.push_back(new PIS_nothing()); mIgnoreStrategies.push_back(new PIS_dotdotdot()); mIgnoreStrategies.push_back(new PIS_blinkname()); |