diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-02 16:30:26 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-02 16:30:26 +0000 |
| commit | 3a448771f4f2b3a9b0f85869983a1482b7444e6d (patch) | |
| tree | 0897d3ed8a98481eb9aba02b1ab3ce4d6c802e95 /crawl-ref/source/player.cc | |
| parent | a8f9c9ba637b6fbf54528548d94a0b5aa02520ce (diff) | |
| download | crawl-ref-3a448771f4f2b3a9b0f85869983a1482b7444e6d.tar.gz crawl-ref-3a448771f4f2b3a9b0f85869983a1482b7444e6d.zip | |
Merge trunk into 0.2 branch for 0.2.1.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1192 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index dd6f5fff6d..22f3339a03 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4736,11 +4736,11 @@ size_type player::body_size(int psize, bool base) const if (psize == PSIZE_TORSO || psize == PSIZE_PROFILE) ret = SIZE_MEDIUM; else - ret = SIZE_BIG; + ret = SIZE_LARGE; break; case SP_CENTAUR: - ret = (psize == PSIZE_TORSO) ? SIZE_MEDIUM : SIZE_BIG; + ret = (psize == PSIZE_TORSO) ? SIZE_MEDIUM : SIZE_LARGE; break; case SP_SPRIGGAN: @@ -5080,7 +5080,7 @@ int player::res_cold() const int player::res_elec() const { - return (player_res_electricity()); + return (player_res_electricity() * 2); } int player::res_poison() const |