summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/mon-util.cc8
-rw-r--r--crawl-ref/source/mon-util.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 7855bbf11e..f1bcce35e0 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -771,14 +771,14 @@ mon_itemuse_type mons_itemuse(int mc)
return (smc->gmon_use);
}
-int mons_colour(const monsters *monster)
+int mons_colour(const monsters *mon)
{
- return (monster->colour);
+ return (mon->colour);
}
-monster_type mons_zombie_base(const monsters *monster)
+monster_type mons_zombie_base(const monsters *mon)
{
- return (monster->base_monster);
+ return (mon->base_monster);
}
bool mons_class_is_zombified(int mc)
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 9fcc37aca8..f6ae1c1103 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -598,7 +598,7 @@ int mons_speed(int mclass);
* called from: dungeon - mon-util - spells2
* *********************************************************************** */
int mons_zombie_size(int mc);
-monster_type mons_zombie_base(const monsters *monster);
+monster_type mons_zombie_base(const monsters *mon);
bool mons_class_is_zombified(int mc);
bool mons_is_zombified(const monsters *monster);
bool mons_class_can_be_zombified(int mc);
@@ -631,7 +631,7 @@ unsigned mons_char(int mc);
* called from: dungeon - fight - misc
* *********************************************************************** */
int mons_class_colour(int mc);
-int mons_colour(const monsters *m);
+int mons_colour(const monsters *mon);
void mons_load_spells( monsters *mon, mon_spellbook_type book );