summaryrefslogtreecommitdiff
path: root/src/dungeon.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:15 +0200
committerBardur Arantsson <bardur@scientician.net>2016-09-17 09:58:15 +0200
commitdc261d2c9732554d9f510e11711ac84d028e5ac1 (patch)
tree2eeb12d57fa130309f26160277fb2677bf928c37 /src/dungeon.cc
parenteea082ffd1a3ecf73b7c464cc28da5ef74d3a30f (diff)
Use grid<> for wilderness grid
Diffstat (limited to 'src/dungeon.cc')
-rw-r--r--src/dungeon.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 16b6bcc0..c6ec2889 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -3524,8 +3524,9 @@ static void process_command(void)
/* Special cases */
else
{
- if ((wf_info[wild_map[p_ptr->py][p_ptr->px].feat].entrance >= 1000) ||
- (wild_map[p_ptr->py][p_ptr->px].entrance > 1000))
+ auto const &wilderness = *wilderness_ptr;
+ auto const &tile = wilderness(p_ptr->px, p_ptr->py);
+ if ((wf_info[tile.feat].entrance >= 1000) || (tile.entrance > 1000))
{
p_ptr->wilderness_x = p_ptr->px;
p_ptr->wilderness_y = p_ptr->py;
@@ -4295,7 +4296,10 @@ static void process_player(void)
/* Hack -- mark current wilderness location as known */
if (!p_ptr->wild_mode && dun_level == 0)
- wild_map[p_ptr->wilderness_y][p_ptr->wilderness_x].known = TRUE;
+ {
+ auto &wilderness = *wilderness_ptr;
+ wilderness(p_ptr->wilderness_x, p_ptr->wilderness_y).known = TRUE;
+ }
/* Place the cursor on the player */