Massive overhaul to move towards coord_def().

This might have introduced some bugs: I now get intermittent crashes
on startup (this might have to do with the changes to special_room.)
Sorry about that - committing before I need to do any more big conflict
resolutions. Fixes coming later.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6732 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 2 insertions, 3 deletions

diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc
index e49ad38e76..85e255784c 100644
--- a/crawl-ref/source/abl-show.cc
+++ b/crawl-ref/source/abl-show.cc
@@ -1623,8 +1623,7 @@ static bool _do_ability(const ability_def& abil)
             beam.type        = dchar_glyph(DCHAR_FIRED_BURST);
             beam.damage      = dice_def(3, 30);
             beam.flavour     = BEAM_ELECTRICITY;
-            beam.target_x    = you.x_pos;
-            beam.target_y    = you.y_pos;
+            beam.target      = you.pos();
             beam.name        = "blast of lightning";
             beam.colour      = LIGHTCYAN;
             beam.thrower     = KILL_YOU;
@@ -1738,7 +1737,7 @@ static bool _do_ability(const ability_def& abil)
         if (!spell_direction(spd, beam, DIR_NONE, TARG_ENEMY))
             return (false);
 
-        if (beam.target() == you.pos())
+        if (beam.target == you.pos())
         {
             mpr("You cannot banish yourself!");
             return (false);