summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godabil.cc
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-30 14:31:12 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-30 14:31:12 +0100
commitd8190f4c633d2c4065e92c61894f85f506d5246a (patch)
tree887402a9869486e5a23386bc41dec9fae1987d39 /crawl-ref/source/godabil.cc
parent1d0cbf5f8be4dcb3d78167d3a1f29691779298f8 (diff)
parent30ad58ea18d6e4e2132d235e60f66f11131e17dc (diff)
downloadcrawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.tar.gz
crawl-ref-d8190f4c633d2c4065e92c61894f85f506d5246a.zip
Merge branch 'master' into iood
Diffstat (limited to 'crawl-ref/source/godabil.cc')
-rw-r--r--crawl-ref/source/godabil.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc
index 7c8e6b5a51..68acb0790e 100644
--- a/crawl-ref/source/godabil.cc
+++ b/crawl-ref/source/godabil.cc
@@ -279,7 +279,7 @@ void yred_make_enslaved_soul(monsters *mon, bool force_hostile,
mon->colour = ETC_UNHOLY;
- mon->flags |= MF_CREATED_FRIENDLY;
+ mon->flags |= MF_NO_REWARD;
mon->flags |= MF_ENSLAVED_SOUL;
if (twisted)
@@ -1146,7 +1146,7 @@ bool evolve_flora()
current_plant->upgrade_type(current_target.new_type, true, true);
current_plant->god = GOD_FEDHAS;
current_plant->attitude = ATT_FRIENDLY;
- current_plant->flags |= MF_CREATED_FRIENDLY;
+ current_plant->flags |= MF_NO_REWARD;
current_plant->flags |= MF_ATT_CHANGE_ATTEMPT;
// Try to remove slowly dying in case we are upgrading a