diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2013-05-29 08:53:36 -0600 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2013-05-29 08:53:36 -0600 |
| commit | c3594225c2f3c70cf34a2171135970d6865f5447 (patch) | |
| tree | b3354af4f439b6b702ad8a04b995040719b85194 /crawl-ref/source/mon-flags.h | |
| parent | 2b5add3121b92307d4a27c819a16d5ada2fed1fc (diff) | |
| parent | 8948773a55e07defa263e2f1131632efffa0fff6 (diff) | |
| download | crawl-ref-c3594225c2f3c70cf34a2171135970d6865f5447.tar.gz crawl-ref-c3594225c2f3c70cf34a2171135970d6865f5447.zip | |
Merge remote-tracking branch 'origin/master' into forest_redux
Conflicts:
crawl-ref/source/evoke.cc
crawl-ref/source/mon-flags.h
crawl-ref/source/spl-miscast.cc
Diffstat (limited to 'crawl-ref/source/mon-flags.h')
| -rw-r--r-- | crawl-ref/source/mon-flags.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-flags.h b/crawl-ref/source/mon-flags.h index 19bae3cb68..8f76bc1203 100644 --- a/crawl-ref/source/mon-flags.h +++ b/crawl-ref/source/mon-flags.h @@ -149,8 +149,11 @@ const uint64_t M_NO_ZOMBIE = (uint64_t)1<<45; // cannot be placed by any means, even on the arena/etc const uint64_t M_CANT_SPAWN = (uint64_t)1<<46; +// derived undead can't be randomly generated +const uint64_t M_NO_GEN_DERIVED = (uint64_t)1<<47; + // tries to maintain range unless target is incapacitated -const uint64_t M_STABBER = (uint64_t)1<<45; +const uint64_t M_STABBER = (uint64_t)1<<48; // Same for flags for actual monsters. typedef uint64_t monster_flag_type; |