summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/abyss.cc2
-rw-r--r--crawl-ref/source/misc.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/abyss.cc b/crawl-ref/source/abyss.cc
index b6077ba081..eb3f9dd9c8 100644
--- a/crawl-ref/source/abyss.cc
+++ b/crawl-ref/source/abyss.cc
@@ -403,7 +403,7 @@ void area_shift(void)
{
#ifdef DEBUG_ABYSS
mprf(MSGCH_DIAGNOSTICS, "area_shift() - player at pos (%d, %d)",
- you.x_pos, you.y_pos);
+ you.youpos.x, you.youpos.y);
#endif
// Preserve floor props around the player, primarily so that
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index fe8243a43c..c04de8e539 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1273,7 +1273,7 @@ void search_around( bool only_adjacent )
grd(*ri) = trap_category(env.trap[i].type);
mpr("You found a trap!");
learned_something_new(TUT_SEEN_TRAP, *ri);
-
+
exercise(SK_TRAPS_DOORS, (coinflip() ? 2 : 1));
}
else
@@ -1802,9 +1802,9 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
{
// Not entirely accurate - the player could die before
// reaching the Abyss.
- if (grd[you.x_pos][you.y_pos] == DNGN_ENTER_ABYSS)
+ if (grd(you.pos()) == DNGN_ENTER_ABYSS)
mark_milestone("abyss.enter", "entered the Abyss!");
- else if (grd[you.x_pos][you.y_pos] == DNGN_EXIT_ABYSS
+ else if (grd(you.pos()) == DNGN_EXIT_ABYSS
&& you.char_direction != GDT_GAME_START)
{
mark_milestone("abyss.exit", "escaped from the Abyss!");