diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2010-09-06 06:33:57 +0200 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2010-09-05 12:56:13 +0200 |
| commit | 31adfd48395f3c74daad1f72b874f497020481a7 (patch) | |
| tree | d7733b7e157fa13c4af485ed7c51b3f97c6b1a72 /crawl-ref/source/mon-speak.cc | |
| parent | a49e4492fc269271c7809d2caeb1e4d80bb0b7bf (diff) | |
| download | crawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.tar.gz crawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.zip | |
Rename class "monsters" to "monster".
Diffstat (limited to 'crawl-ref/source/mon-speak.cc')
| -rw-r--r-- | crawl-ref/source/mon-speak.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 03ecf68740..44f579d57e 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -220,7 +220,7 @@ static std::string _try_exact_string(const std::vector<std::string> &prefixes, static std::string __get_speak_string(const std::vector<std::string> &prefixes, const std::string &key, - const monsters* mons, + const monster* mons, bool no_player, bool no_foe, bool no_foe_name, bool no_god, bool unseen) @@ -289,7 +289,7 @@ static std::string __get_speak_string(const std::vector<std::string> &prefixes, static std::string _get_speak_string(const std::vector<std::string> &prefixes, std::string key, - const monsters* mons, + const monster* mons, bool no_player, bool no_foe, bool no_foe_name, bool no_god, bool unseen) @@ -337,7 +337,7 @@ static std::string _get_speak_string(const std::vector<std::string> &prefixes, // Returns true if the monster did speak, false otherwise. // Maybe monsters will speak! -void maybe_mons_speaks (monsters* mons) +void maybe_mons_speaks (monster* mons) { #define MON_SPEAK_CHANCE 21 @@ -391,7 +391,7 @@ void maybe_mons_speaks (monsters* mons) // Returns true if something is said. -bool mons_speaks(monsters* mons) +bool mons_speaks(monster* mons) { ASSERT(!invalid_monster_type(mons->type)); @@ -472,7 +472,7 @@ bool mons_speaks(monsters* mons) const actor* foe = (!crawl_state.game_is_arena() && mons->wont_attack() && invalid_monster_index(mons->foe)) ? &you : mons->get_foe(); - const monsters* m_foe = foe ? foe->as_monster() : NULL; + const monster* m_foe = foe ? foe->as_monster() : NULL; if (!foe || foe->atype() == ACT_PLAYER || mons->wont_attack()) { @@ -825,7 +825,7 @@ bool mons_speaks(monsters* mons) return (mons_speaks_msg(mons, msg, MSGCH_TALK, silence)); } -bool mons_speaks_msg(monsters* mons, const std::string &msg, +bool mons_speaks_msg(monster* mons, const std::string &msg, const msg_channel_type def_chan, const bool silence) { if (!mons_near(mons)) |