summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-util.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/mon-util.h')
-rw-r--r--crawl-ref/source/mon-util.h28
1 files changed, 5 insertions, 23 deletions
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index a66fa48580..82dfa1b68f 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -121,22 +121,12 @@ struct monsterentry
* *********************************************************************** */
void init_monsters( FixedVector<unsigned short, 1000>& colour );
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: bang - beam - debug - direct - effects - fight - item_use -
- * monstuff - mstuff2 - ouch - spells1 - spells2 - spells3 -
- * spells4
- * *********************************************************************** */
-// mons_wpn only important for dancing weapons -- bwr
-const char *monam(const monsters *mon,
- int mons_num, int mons, bool vis,
- description_level_type desc, int mons_wpn = NON_ITEM);
-
-// these front for monam
-const char *ptr_monam(const monsters *mon, description_level_type desc,
- bool force_seen = false);
-std::string str_monam(const monsters *mon, description_level_type desc,
+// this is the old monam(), ptr_monam()
+std::string str_monam(const monsters& mon, description_level_type desc,
bool force_seen = false);
+
+// this is the old moname()
+std::string mons_type_name(int type, description_level_type desc );
// last updated 12may2000 {dlb}
/* ***********************************************************************
@@ -345,14 +335,6 @@ void mons_load_spells( monsters *mon, int book );
void define_monster(int mid);
-// last updated 12may2000 {dlb}
-/* ***********************************************************************
- * called from: debug - itemname - mon-util
- * *********************************************************************** */
-const char *moname(int mcl, bool vis, description_level_type descrip,
- char glog[ ITEMNAME_SIZE ]);
-
-
#ifdef DEBUG_DIAGNOSTICS
// last updated 25sep2001 {dlb}
/* ***********************************************************************