From 111787503763e9d3eeb4eef2248926bf4a4eeb98 Mon Sep 17 00:00:00 2001 From: haranp Date: Thu, 24 Jul 2008 10:38:05 +0000 Subject: More cleanups. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6669 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/abl-show.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/abl-show.cc') diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 858e5ceed9..e49ad38e76 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -1348,7 +1348,7 @@ static bool _do_ability(const ability_def& abil) return (false); } - torment(TORMENT_GENERIC, you.x_pos, you.y_pos); + torment(TORMENT_GENERIC, you.pos()); break; case ABIL_RAISE_DEAD: @@ -1881,7 +1881,7 @@ static bool _do_ability(const ability_def& abil) return (false); } - torment(TORMENT_GENERIC, you.x_pos, you.y_pos); + torment(TORMENT_GENERIC, you.pos()); exercise(SK_INVOCATIONS, 2 + random2(4)); break; @@ -2381,12 +2381,12 @@ static int _find_ability_slot( ability_type which_ability ) //////////////////////////////////////////////////////////////////////////// -static int _lugonu_warp_monster(int x, int y, int pow, int) +static int _lugonu_warp_monster(coord_def where, int pow, int) { - if (!in_bounds(x, y) || mgrd[x][y] == NON_MONSTER) + if (!in_bounds(where) || mgrd(where) == NON_MONSTER) return (0); - monsters &mon = menv[ mgrd[x][y] ]; + monsters &mon = menv[ mgrd(where) ]; if (!mons_friendly(&mon)) behaviour_event( &mon, ME_ANNOY, MHITYOU ); @@ -2415,7 +2415,7 @@ static int _lugonu_warp_monster(int x, int y, int pow, int) static void _lugonu_warp_area(int pow) { - apply_area_around_square( _lugonu_warp_monster, you.x_pos, you.y_pos, pow ); + apply_area_around_square( _lugonu_warp_monster, you.pos(), pow ); } static void _lugonu_bends_space() -- cgit v1.2.3-54-g00ecf