diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 01:45:36 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-17 01:45:36 +0000 |
| commit | ad41d5694a9a1c298965910184fefe6ac3e677db (patch) | |
| tree | 58c54111245a1e22cc09479c3d2497d007ef6d09 /crawl-ref | |
| parent | 1eff96d6a545f553cb96cc6347f712c5262a1852 (diff) | |
| download | crawl-ref-ad41d5694a9a1c298965910184fefe6ac3e677db.tar.gz crawl-ref-ad41d5694a9a1c298965910184fefe6ac3e677db.zip | |
For consistency, rename the DID_FRIEND_DIES conduct to DID_FRIEND_DIED.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5095 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 2209fa92f5..b751effce0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -636,7 +636,7 @@ enum conduct_type DID_ATTACK_HOLY, DID_ATTACK_NEUTRAL, DID_ATTACK_FRIEND, - DID_FRIEND_DIES, + DID_FRIEND_DIED, DID_STABBING, DID_UNCHIVALRIC_ATTACK, DID_POISON, diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 3424850237..7c99ec5860 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1034,7 +1034,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) // no piety loss if god gifts killed by other monsters if (mons_friendly(monster) && !testbits(monster->flags,MF_GOD_GIFT)) { - did_god_conduct(DID_FRIEND_DIES, 1 + (monster->hit_dice / 2), + did_god_conduct(DID_FRIEND_DIED, 1 + (monster->hit_dice / 2), true, monster); } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ba2193d0cb..77a52bdc69 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1940,7 +1940,7 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, } break; - case DID_FRIEND_DIES: + case DID_FRIEND_DIED: switch (you.religion) { case GOD_ELYVILON: // healer god cares more about this diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 4784f1009d..144d9bffae 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -917,7 +917,7 @@ bool remove_sanctuary(bool did_attack) { if (seen_change) simple_god_message(" revokes the gift of sanctuary.", GOD_ZIN); - did_god_conduct(DID_FRIEND_DIES, 3); + did_god_conduct(DID_FRIEND_DIED, 3); } if (is_resting()) |