diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 10:38:05 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-24 10:38:05 +0000 |
| commit | 111787503763e9d3eeb4eef2248926bf4a4eeb98 (patch) | |
| tree | 8af6fcd44ef05ff7cb092dfe3084c13f58e3ba74 /crawl-ref/source/decks.cc | |
| parent | a7ba97bc95fa25180bd402a52943f223da2bf04a (diff) | |
| download | crawl-ref-111787503763e9d3eeb4eef2248926bf4a4eeb98.tar.gz crawl-ref-111787503763e9d3eeb4eef2248926bf4a4eeb98.zip | |
More cleanups.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6669 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 0629fc1c3d..62d558fdd4 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1561,14 +1561,14 @@ static void _minefield_card(int power, deck_rarity_type rarity) } } -static int _drain_monsters(int x, int y, int pow, int garbage) +static int _drain_monsters(coord_def where, int pow, int garbage) { UNUSED( garbage ); - if (coord_def(x,y) == you.pos()) + if (where == you.pos()) drain_exp(); else { - const int mnstr = mgrd[x][y]; + const int mnstr = mgrd(where); if (mnstr == NON_MONSTER) return 0; @@ -2811,7 +2811,7 @@ bool card_effect(card_type which_card, deck_rarity_type rarity, case CARD_TROWEL: rc = _trowel_card(power, rarity); break; case CARD_SPADE: your_spells(SPELL_DIG, random2(power/4), false); break; case CARD_BANSHEE: mass_enchantment(ENCH_FEAR, power, MHITYOU); break; - case CARD_TORMENT: torment(TORMENT_CARDS, you.x_pos, you.y_pos); break; + case CARD_TORMENT: torment(TORMENT_CARDS, you.pos()); break; case CARD_VENOM: if (coinflip()) |