summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/player.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-11 11:31:22 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-12-11 11:31:22 +0000
commitcc9ba6c05755e235c14daa555bbd037813f91a6e (patch)
tree7373373a33fabd4bc5c163d64ba767f18edf3093 /crawl-ref/source/player.cc
parenta9ac64d3b972306982b27c81632182864022f939 (diff)
downloadcrawl-ref-cc9ba6c05755e235c14daa555bbd037813f91a6e.tar.gz
crawl-ref-cc9ba6c05755e235c14daa555bbd037813f91a6e.zip
* Nerf harpies a bit: they are now slower and have no bite attack
(which didn't make sense anyway). * Also list player god in the saved game selection menu. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7808 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
-rw-r--r--crawl-ref/source/player.cc20
1 files changed, 12 insertions, 8 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index ef3d1a5f66..5dbd7003eb 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5788,19 +5788,20 @@ void player::init()
player_save_info player_save_info::operator=(const player& rhs)
{
- name = rhs.your_name;
- experience = rhs.experience;
+ name = rhs.your_name;
+ experience = rhs.experience;
experience_level = rhs.experience_level;
- wizard = rhs.wizard;
- species = rhs.species;
- class_name = rhs.class_name;
- return *this;
+ wizard = rhs.wizard;
+ species = rhs.species;
+ class_name = rhs.class_name;
+ religion = rhs.religion;
+ return (*this);
}
bool player_save_info::operator<(const player_save_info& rhs) const
{
- return experience < rhs.experience ||
- (experience == rhs.experience && name < rhs.name);
+ return experience < rhs.experience
+ || (experience == rhs.experience && name < rhs.name);
}
std::string player_save_info::short_desc() const
@@ -5810,6 +5811,9 @@ std::string player_save_info::short_desc() const
<< species_name(species, experience_level) << ' '
<< class_name;
+ if (religion != GOD_NO_GOD)
+ desc << " of " << god_name(religion);
+
#ifdef WIZARD
if (wizard)
desc << " (WIZ)";