diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-06-19 16:05:04 -0400 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-06-22 10:03:45 -0400 |
| commit | 465957cba490a2a9d5444a64523572a90cfb837f (patch) | |
| tree | 536c94ce0702e60217120aa2bb27325aff1b8f2d /crawl-ref/source/mon-death.h | |
| parent | 393eda0d444702a7eda580e6c363bbdcaba8d54e (diff) | |
| download | crawl-ref-465957cba490a2a9d5444a64523572a90cfb837f.tar.gz crawl-ref-465957cba490a2a9d5444a64523572a90cfb837f.zip | |
The great mon-stuff migration.
A good deal of functions move to the two new files, mon-poly and
mon-message. Of the others, some go to where they are used, some to
mon-util, and a few are made member methods of monster.
This probably breaks Xcode compilation, and I'm not able to test
the changes I made to MSVC that will (hopefully) keep it working.
Diffstat (limited to 'crawl-ref/source/mon-death.h')
| -rw-r--r-- | crawl-ref/source/mon-death.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/crawl-ref/source/mon-death.h b/crawl-ref/source/mon-death.h index e7c99d7bde..37b66b2455 100644 --- a/crawl-ref/source/mon-death.h +++ b/crawl-ref/source/mon-death.h @@ -9,6 +9,18 @@ #define FRESHEST_CORPSE 210 #define ROTTING_CORPSE 99 +#define ORIG_MONSTER_KEY "orig_monster_key" + +#define YOU_KILL(x) ((x) == KILL_YOU || (x) == KILL_YOU_MISSILE \ + || (x) == KILL_YOU_CONF) +#define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE) + +#define SAME_ATTITUDE(x) (x->friendly() ? BEH_FRIENDLY : \ + x->good_neutral() ? BEH_GOOD_NEUTRAL : \ + x->strict_neutral() ? BEH_STRICT_NEUTRAL : \ + x->neutral() ? BEH_NEUTRAL \ + : BEH_HOSTILE) + struct bolt; int monster_die(monster* mons, const actor *killer, bool silent = false, @@ -41,6 +53,8 @@ int exp_rate(int killer); void mons_check_pool(monster* mons, const coord_def &oldpos, killer_type killer = KILL_NONE, int killnum = -1); +int dismiss_monsters(string pattern); + string summoned_poof_msg(const monster* mons, bool plural = false); string summoned_poof_msg(const int midx, const item_def &item); string summoned_poof_msg(const monster* mons, const item_def &item); |