diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 21:01:46 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-06 21:01:46 +0000 |
| commit | e76fa04ee8cfd52c224e3ec72ff0b23796eb6029 (patch) | |
| tree | 73fa8ac4235a5c609027c62b5534d9c575c3e467 /crawl-ref/source/monplace.cc | |
| parent | 703ecf2d592818a7bbffc70bc49a943ab7f24a33 (diff) | |
| download | crawl-ref-e76fa04ee8cfd52c224e3ec72ff0b23796eb6029.tar.gz crawl-ref-e76fa04ee8cfd52c224e3ec72ff0b23796eb6029.zip | |
Allow creation of non-friendly god gifts. The BEH_GOD_GIFT behavior has
been removed, and the MF_GOD_GIFT flag is set directly instead.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5503 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 5780548926..f0f56b6fa0 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -907,9 +907,12 @@ static int _place_monster_aux( const mgen_data &mg, // attitude is hostile. if (mg.behaviour > NUM_BEHAVIOURS) { - if (mg.behaviour == BEH_FRIENDLY || mg.behaviour == BEH_GOD_GIFT) + if (mg.behaviour == BEH_FRIENDLY) menv[id].attitude = ATT_FRIENDLY; + if (mg.behaviour == BEH_GOOD_NEUTRAL) + menv[id].attitude = ATT_GOOD_NEUTRAL; + if (mg.behaviour == BEH_NEUTRAL) menv[id].attitude = ATT_NEUTRAL; @@ -1754,7 +1757,7 @@ void mark_interesting_monst(struct monsters* monster, beh_type behaviour) if ( mons_is_unique(monster->type) ) interesting = true; // If it's never going to attack us, then not interesting - else if (behaviour == BEH_FRIENDLY || behaviour == BEH_GOD_GIFT) + else if (behaviour == BEH_FRIENDLY) interesting = false; // Don't waste time on moname() if user isn't using this option else if (Options.note_monsters.size() > 0) @@ -1861,15 +1864,15 @@ int mons_place( mgen_data mg ) monsters *creation = &menv[mid]; - // Look at special cases: CHARMED, FRIENDLY, HOSTILE, GOD_GIFT. - // Alert summoned being to player's presence. + // Look at special cases: CHARMED, FRIENDLY, NEUTRAL, GOOD_NEUTRAL, + // HOSTILE. if (mg.behaviour > NUM_BEHAVIOURS) { - if (mg.behaviour == BEH_FRIENDLY || mg.behaviour == BEH_GOD_GIFT) + if (mg.behaviour == BEH_FRIENDLY) creation->flags |= MF_CREATED_FRIENDLY; - if (mg.behaviour == BEH_GOD_GIFT) - creation->flags |= MF_GOD_GIFT; + if (mg.behaviour == BEH_NEUTRAL || mg.behaviour == BEH_GOOD_NEUTRAL) + creation->flags |= MF_WAS_NEUTRAL; if (mg.behaviour == BEH_CHARMED) { |