diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-28 02:52:38 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-28 02:52:38 +0000 |
| commit | 7c63df66a7271a34cb7b69729892273d833f40fb (patch) | |
| tree | 512fad96ec7675bde5ffb4e9d409e8b774f529b7 /crawl-ref/source/monstuff.cc | |
| parent | de8f4030ab16a4d839e67096aa45c89de5b0d9ab (diff) | |
| download | crawl-ref-7c63df66a7271a34cb7b69729892273d833f40fb.tar.gz crawl-ref-7c63df66a7271a34cb7b69729892273d833f40fb.zip | |
Clean up some instances of friendly vs. hostile summoning.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3905 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.cc')
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index f29527ad53..63211593b6 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -644,13 +644,13 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) if (!silent && _monster_avoided_death(monster, killer, i)) return; - + if (mons_is_caught(monster)) mons_clear_trapping_net(monster); // update list of monsters beholding player update_beholders(monster, true); - + const int monster_killed = monster_index(monster); bool death_message = !silent && mons_near(monster) && player_monster_visible(monster); @@ -685,7 +685,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) monster->name(DESC_NOCAP_A, true).c_str())); } } - + // From time to time Trog gives you a little bonus if (killer == KILL_YOU && you.duration[DUR_BERSERKER]) { @@ -1069,7 +1069,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) case KILL_DISMISSED: break; - + default: monster->destroy_inventory(); break; @@ -1108,7 +1108,7 @@ void monster_die(monsters *monster, killer_type killer, int i, bool silent) { // Provide the player with an ingame clue to Boris' return. -- bwr const int tmp = random2(6); - simple_monster_message( monster, + simple_monster_message( monster, (tmp == 0) ? " says, \"You haven't seen the last of me!\"" : (tmp == 1) ? " says, \"I'll get you next time!\"" : (tmp == 2) ? " says, \"This isn't over yet!\"" : |