diff options
| author | Vsevolod Kozlov <zaba@thorium.homeunix.org> | 2009-11-06 19:46:32 +0300 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-06 19:52:58 +0100 |
| commit | b4b8747ec41b3fa6543d7c51e02515b0cec1496f (patch) | |
| tree | efb1625c80d595b58b8bde933decd1dfc674ee04 /crawl-ref/source/monspeak.cc | |
| parent | 22adbee6a63d3fb1ee05d0e6ff41e80e95b4afc7 (diff) | |
| download | crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.tar.gz crawl-ref-b4b8747ec41b3fa6543d7c51e02515b0cec1496f.zip | |
Move mons_is_friendly to monsters::friendly.
Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/monspeak.cc')
| -rw-r--r-- | crawl-ref/source/monspeak.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc index 6ac5e4544c..f40a148903 100644 --- a/crawl-ref/source/monspeak.cc +++ b/crawl-ref/source/monspeak.cc @@ -412,7 +412,7 @@ bool mons_speaks(monsters *monster) prefixes.push_back("neutral"); } - else if (mons_friendly(monster) && !crawl_state.arena) + else if (monster->friendly() && !crawl_state.arena) prefixes.push_back("friendly"); else prefixes.push_back("hostile"); @@ -766,13 +766,13 @@ bool mons_speaks_msg(monsters *monster, const std::string &msg, msg_type = MSGCH_TALK_VISUAL; else if (param == "SPELL" && !silence || param == "VISUAL SPELL") { - msg_type = mons_friendly(monster) ? MSGCH_FRIEND_SPELL + msg_type = monster->friendly() ? MSGCH_FRIEND_SPELL : MSGCH_MONSTER_SPELL; } else if (param == "ENCHANT" && !silence || param == "VISUAL ENCHANT") { - msg_type = mons_friendly(monster) ? MSGCH_FRIEND_ENCHANT + msg_type = monster->friendly() ? MSGCH_FRIEND_ENCHANT : MSGCH_MONSTER_ENCHANT; } else if (param == "PLAIN") |