diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 14:22:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-08-07 14:22:12 +0000 |
| commit | 3df5b1d3140e461c40fa88ab4f80554b9912372c (patch) | |
| tree | f672ff0bf434ababdca38a1fa495e79334f37b11 /crawl-ref/source/player.cc | |
| parent | b8a2e8112e707f39c40a82055cf496958d7cd094 (diff) | |
| download | crawl-ref-3df5b1d3140e461c40fa88ab4f80554b9912372c.tar.gz crawl-ref-3df5b1d3140e461c40fa88ab4f80554b9912372c.zip | |
Backport r6743, 6750, 6753, 6771, 6772, 6790 to 0.4.
* Fix 2033984: Monsters being created with both a shield and a 2-hander.
* FR 2026227: Make $ list current gold.
* Fix assertion failure upon high-scoring death.
* Fix 2037146: Make hill giants use MONUSE_STARTING_EQUIPMENT.
* Fix 2036429: better spacing on ^ screen.
* Replace "Level:" with "Place:" in the HUD.
Also start on 0.4.4 change log.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6791 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/player.cc')
| -rw-r--r-- | crawl-ref/source/player.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index b50ea279e6..bf87fa062a 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4233,7 +4233,7 @@ int player_mental_clarity(bool calc_unid, bool items) return ((ret > 3) ? 3 : ret); } -bool wearing_amulet(char amulet, bool calc_unid) +bool wearing_amulet(jewellery_type amulet, bool calc_unid) { if (amulet == AMU_CONTROLLED_FLIGHT && (you.duration[DUR_CONTROLLED_FLIGHT] |