diff options
| author | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-10-01 17:32:34 -0500 |
| commit | 2057b86a740fdaf7c9879ee9c9bd7dd296685c73 (patch) | |
| tree | c1d9b88b860230dce07aa81a1ecd3a0b6c5917a1 /crawl-ref/source/player-act.cc | |
| parent | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (diff) | |
| parent | e7b95c8c9b3bd68a43ba0da89221226cd41dcc80 (diff) | |
| download | crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.tar.gz crawl-ref-2057b86a740fdaf7c9879ee9c9bd7dd296685c73.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/source/dat/des/variable/mini_monsters.des
crawl-ref/source/enum.h
crawl-ref/source/itemprop.cc
crawl-ref/source/main.cc
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/newgame.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/rltiles/dc-player.txt
crawl-ref/source/spl-selfench.cc
crawl-ref/source/throw.cc
crawl-ref/source/tilepick-p.cc
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index a93ffe0c29..fe78c60be8 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -269,7 +269,7 @@ brand_type player::damage_brand(int) } // Returns the item in the given equipment slot, NULL if the slot is empty. -// eq must be in [EQ_WEAPON, EQ_RING_EIGHT], or bad things will happen. +// eq must be in [EQ_WEAPON, EQ_RING_AMULET], or bad things will happen. item_def *player::slot_item(equipment_type eq, bool include_melded) const { ASSERT_RANGE(eq, EQ_WEAPON, NUM_EQUIP); @@ -732,7 +732,7 @@ bool player::can_go_berserk(bool intentional, bool potion, bool quiet) const bool player::berserk() const { - return (duration[DUR_BERSERK]); + return duration[DUR_BERSERK]; } bool player::can_cling_to_walls() const |