diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 16:19:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-12 16:19:55 +0000 |
| commit | 32db69fe90588c638f34feaed60c1ea4de9ba214 (patch) | |
| tree | 4b5fb2cc462fbf2a9a750fc3d1108eec1669ffaf /crawl-ref/source/monstuff.cc | |
| parent | c8e3a829389f387b3c54ea512cbe2e9e7a81c546 (diff) | |
| download | crawl-ref-32db69fe90588c638f34feaed60c1ea4de9ba214.tar.gz crawl-ref-32db69fe90588c638f34feaed60c1ea4de9ba214.zip | |
Apply my previous commit to trunk: plants/fungi not triggering conducts.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10190 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index c0a6a6a0ec..d429a337cc 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1133,7 +1133,8 @@ int monster_die(monsters *monster, killer_type killer, &summon_type); const int monster_killed = monster_index(monster); const bool hard_reset = testbits(monster->flags, MF_HARD_RESET); - const bool gives_xp = !summoned; + const bool gives_xp = (!summoned && !mons_class_flag(monster->type, + M_NO_EXP_GAIN)); const bool drop_items = !hard_reset; |