summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/exclude.cc
diff options
context:
space:
mode:
authorRobert Vollmert <rvollmert@gmx.net>2010-09-06 06:33:57 +0200
committerRobert Vollmert <rvollmert@gmx.net>2010-09-05 12:56:13 +0200
commit31adfd48395f3c74daad1f72b874f497020481a7 (patch)
treed7733b7e157fa13c4af485ed7c51b3f97c6b1a72 /crawl-ref/source/exclude.cc
parenta49e4492fc269271c7809d2caeb1e4d80bb0b7bf (diff)
downloadcrawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.tar.gz
crawl-ref-31adfd48395f3c74daad1f72b874f497020481a7.zip
Rename class "monsters" to "monster".
Diffstat (limited to 'crawl-ref/source/exclude.cc')
-rw-r--r--crawl-ref/source/exclude.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc
index 37d6563284..aba655c0cb 100644
--- a/crawl-ref/source/exclude.cc
+++ b/crawl-ref/source/exclude.cc
@@ -25,7 +25,7 @@
#include "hints.h"
#include "view.h"
-static bool _mon_needs_auto_exclude(const monsters *mon, bool sleepy = false)
+static bool _mon_needs_auto_exclude(const monster* mon, bool sleepy = false)
{
if (mons_is_stationary(mon))
{
@@ -41,7 +41,7 @@ static bool _mon_needs_auto_exclude(const monsters *mon, bool sleepy = false)
}
// Check whether a given monster is listed in the auto_exclude option.
-bool need_auto_exclude(const monsters *mon, bool sleepy)
+bool need_auto_exclude(const monster* mon, bool sleepy)
{
// This only works if the name is lowercased.
std::string name = mon->name(DESC_BASENAME,
@@ -63,7 +63,7 @@ bool need_auto_exclude(const monsters *mon, bool sleepy)
// If the monster is in the auto_exclude list, automatically set an
// exclusion.
-void set_auto_exclude(const monsters *mon)
+void set_auto_exclude(const monster* mon)
{
if (need_auto_exclude(mon) && !is_exclude_root(mon->pos()))
{
@@ -87,7 +87,7 @@ void set_auto_exclude(const monsters *mon)
// Clear auto exclusion if the monster is killed or wakes up with the
// player in sight. If sleepy is true, stationary monsters are ignored.
-void remove_auto_exclude(const monsters *mon, bool sleepy)
+void remove_auto_exclude(const monster* mon, bool sleepy)
{
if (need_auto_exclude(mon, sleepy))
{
@@ -524,7 +524,7 @@ void maybe_remove_autoexclusion(const coord_def &p)
if (!exc->autoex)
return;
- const monsters *m = monster_at(p);
+ const monster* m = monster_at(p);
if (!m || !you.can_see(m)
|| m->attitude != ATT_HOSTILE
&& m->type != MONS_HYPERACTIVE_BALLISTOMYCETE