diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-25 13:23:23 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-03-25 13:23:23 +0000 |
commit | bdb45bf27b86ff63c5afdff311b4065c83faf37d (patch) | |
tree | cf3a914532ecc372932b8d897e8c9abf57fbe2a4 /crawl-ref/source/player.cc | |
parent | c500c6b3582877a10bd362722bde81eb9b94b917 (diff) | |
download | crawl-ref-bdb45bf27b86ff63c5afdff311b4065c83faf37d.tar.gz crawl-ref-bdb45bf27b86ff63c5afdff311b4065c83faf37d.zip |
Merged in crawl.akrasiac.org patches (simple messaging, milestones). These take
effect only if compiled with -DDGAMELAUNCH.
Simple messaging: interacts with dgamelaunch's messaging facility allowing
viewers to send messages to the player.
Milestones: Writes a milestones.txt file (in xlogfile format) for things like
the player killing uniques, reaching the end of a dungeon branch, etc. (similar
to notes). milestones.txt is used for game announcements by an IRC bot.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1095 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r-- | crawl-ref/source/player.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index c929776c85..29566cf85f 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4501,6 +4501,8 @@ void player::init() your_name[0] = 0; banished = false; + banished_by.clear(); + just_autoprayed = false; berserk_penalty = 0; berserker = 0; @@ -4944,9 +4946,10 @@ void player::god_conduct(int thing_done, int level) ::did_god_conduct(thing_done, level); } -void player::banish() +void player::banish(const std::string &who) { - banished = true; + banished = true; + banished_by = who; } void player::make_hungry(int hunger_increase, bool silent) |