diff options
author | Florian Diebold <flodiebold@gmail.com> | 2011-11-07 14:31:24 +0100 |
---|---|---|
committer | Florian Diebold <flodiebold@gmail.com> | 2011-11-23 19:05:49 +0100 |
commit | 1326a7e9556198e7388b0e1c7427def08ac0d7e1 (patch) | |
tree | a400dec48d1ba272b7fb22029acd8709f247159d /crawl-ref/source/mon-info.h | |
parent | 32d2ddfe039e01e5c1a3bb25cbde198b13b6a796 (diff) | |
download | crawl-ref-1326a7e9556198e7388b0e1c7427def08ac0d7e1.tar.gz crawl-ref-1326a7e9556198e7388b0e1c7427def08ac0d7e1.zip |
Use monster_info instead of monster for tile picking.
See #4280. This will allow regenerating tiles out of view from the
map_knowledge, and we won't need to save the mcache anymore.
There are still a few uses of monster in the interface code, which
will have to be hunted down.
Diffstat (limited to 'crawl-ref/source/mon-info.h')
-rw-r--r-- | crawl-ref/source/mon-info.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-info.h b/crawl-ref/source/mon-info.h index cb78a48854..4cb553a3c9 100644 --- a/crawl-ref/source/mon-info.h +++ b/crawl-ref/source/mon-info.h @@ -190,6 +190,7 @@ struct monster_info : public monster_info_base std::string db_name() const; bool has_proper_name() const; dungeon_feature_type get_mimic_feature() const; + const item_def* get_mimic_item() const; std::string mimic_name() const; std::string pluralized_name(bool fullname = true) const; std::string common_name(description_level_type desc = DESC_PLAIN) const; @@ -241,6 +242,17 @@ struct monster_info : public monster_info_base size_type body_size() const; + // These should be kept in sync with the actor equivalents + // (Maybe unify somehow?) + bool cannot_move() const; + bool airborne() const; + bool ground_level() const; + + bool is_named() const + { + return (!mname.empty() || mons_is_unique(type)); + } + protected: std::string _core_name() const; std::string _apply_adjusted_description(description_level_type desc, const std::string& s) const; |