diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 23:01:45 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 23:01:45 +0000 |
| commit | b9dfc33d7aa3dd4136b8379fcf7010020dba98d9 (patch) | |
| tree | e009fcb166df34c299aa82de8c1941e0254069b7 | |
| parent | 7228c6fea48a4a72cb69332781bbe5106d09ff2a (diff) | |
| download | crawl-ref-b9dfc33d7aa3dd4136b8379fcf7010020dba98d9.tar.gz crawl-ref-b9dfc33d7aa3dd4136b8379fcf7010020dba98d9.zip | |
Go back to using "your" for follower blessings, and add whitespace fixes
again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3962 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 6fefb4d5d7..6cf17439f7 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -499,7 +499,7 @@ static bool _ely_protects_ally(monsters *monster) { return (false); } - + monster->hit_points = 1; snprintf(info, INFO_SIZE, " protects %s%s from harm!%s", mons_is_unique(monster->type) ? "" : "your ", @@ -507,7 +507,7 @@ static bool _ely_protects_ally(monsters *monster) coinflip() ? "" : " You feel responsible."); simple_god_message(info); lose_piety(1); - + return (true); } diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 00e75b4fc9..7e1ec59f3e 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1047,8 +1047,8 @@ bool bless_follower(monsters* follower, mon = &menv[monster]; } - blessed = (follower && !mons_near(follower)) ? "a follower" - : mon->name(DESC_NOCAP_A).c_str(); + blessed = (follower && !mons_near(follower)) ? "your follower" + : mon->name(DESC_PLAIN).c_str(); if (chance == 0) { @@ -1182,8 +1182,9 @@ bool bless_follower(monsters* follower, } blessing_done: - snprintf(info, INFO_SIZE, " blesses %s with %s.", blessed.c_str(), - result.c_str()); + snprintf(info, INFO_SIZE, " blesses %s%s with %s.", + mons_is_unique(mon->type) ? "" : "your ", + blessed.c_str(), result.c_str()); simple_god_message(info); return true; |