diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-02-20 05:07:00 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-02-20 05:07:00 +0100 |
| commit | 30d37ef7a7daa2b88f93d43bccb9c141448edf65 (patch) | |
| tree | d24da09d0c51b53cbd1e8507a252af5a8f61a841 /crawl-ref/source/mgen_data.h | |
| parent | b89be0430b6359a069e13c86565dbf6985eefe5e (diff) | |
| parent | 9d196e98bf78ac3589ad650da44d0b9a2d6613a2 (diff) | |
| download | crawl-ref-30d37ef7a7daa2b88f93d43bccb9c141448edf65.tar.gz crawl-ref-30d37ef7a7daa2b88f93d43bccb9c141448edf65.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/mgen_data.h')
| -rw-r--r-- | crawl-ref/source/mgen_data.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/mgen_data.h b/crawl-ref/source/mgen_data.h index bc67c1c4e5..3120a4d2c2 100644 --- a/crawl-ref/source/mgen_data.h +++ b/crawl-ref/source/mgen_data.h @@ -1,12 +1,13 @@ #ifndef MGEN_DATA_H #define MGEN_DATA_H +#include "coord.h" #include "mgen_enum.h" #include "player.h" // Hash key for passing a weapon to be given to // a dancing weapon. -const std::string TUKIMA_WEAPON = "tukima-weapon"; +#define TUKIMA_WEAPON "tukima-weapon" // A structure with all the data needed to whip up a new monster. struct mgen_data @@ -158,7 +159,7 @@ struct mgen_data // Is there a valid position set on this struct that we want to use // when placing the monster? - bool use_position() const; + bool use_position() const { return in_bounds(pos); }; bool summoned() const { return (abjuration_duration > 0); } |