diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2018-03-25 20:07:30 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2018-03-25 20:07:30 +0200 |
| commit | 45651c61e35ee203c434601ace5e95ccd5474375 (patch) | |
| tree | c52f30588611a72deebd8f7f83199d1b0a644b5e /src/cave.cc | |
| parent | 73238d2c617be1600bbb067e0d0bd388488f68d3 (diff) | |
Add object_type->k_ptr to point directly to the object_kind
The idea is to eventually migrate off k_idx completely, but there are
still a couple of uses left.
Diffstat (limited to 'src/cave.cc')
| -rw-r--r-- | src/cave.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/cave.cc b/src/cave.cc index 2ab97283..c582eab3 100644 --- a/src/cave.cc +++ b/src/cave.cc @@ -439,9 +439,9 @@ static void image_object(byte *ap, char *cp) auto const &k_info = game->edit_data.k_info; // Select an object kind at random - auto const &k_ref = uniform_element(k_info)->second; - *cp = k_ref.x_char; - *ap = k_ref.x_attr; + auto const &k_ptr = uniform_element(k_info)->second; + *cp = k_ptr->x_char; + *ap = k_ptr->x_attr; } @@ -831,7 +831,6 @@ static void map_info(int y, int x, byte *ap, char *cp) auto const &st_info = game->edit_data.st_info; auto const &r_info = game->edit_data.r_info; auto const &f_info = game->edit_data.f_info; - auto const &k_info = game->edit_data.k_info; byte a; @@ -1038,7 +1037,7 @@ static void map_info(int y, int x, byte *ap, char *cp) *ap = object_attr(o_ptr); /* Multi-hued attr */ - if (!options->avoid_other && (k_info.at(o_ptr->k_idx).flags & TR_ATTR_MULTI)) + if (!options->avoid_other && (o_ptr->k_ptr->flags & TR_ATTR_MULTI)) { *ap = get_shimmer_color(); } @@ -1074,7 +1073,7 @@ static void map_info(int y, int x, byte *ap, char *cp) *ap = object_attr(o_ptr); /* Multi-hued attr */ - if (!options->avoid_other && (k_info.at(o_ptr->k_idx).flags & TR_ATTR_MULTI)) + if (!options->avoid_other && (o_ptr->k_ptr->flags & TR_ATTR_MULTI)) { *ap = get_shimmer_color(); } @@ -1223,7 +1222,6 @@ void map_info_default(int y, int x, byte *ap, char *cp) auto const &st_info = game->edit_data.st_info; auto const &r_info = game->edit_data.r_info; auto const &f_info = game->edit_data.f_info; - auto const &k_info = game->edit_data.k_info; byte a; @@ -1428,7 +1426,7 @@ void map_info_default(int y, int x, byte *ap, char *cp) *ap = object_attr_default(o_ptr); /* Multi-hued attr */ - if (!avoid_other && (k_info.at(o_ptr->k_idx).flags & TR_ATTR_MULTI)) + if (!avoid_other && (o_ptr->k_ptr->flags & TR_ATTR_MULTI)) { *ap = get_shimmer_color(); } @@ -1464,7 +1462,7 @@ void map_info_default(int y, int x, byte *ap, char *cp) *ap = object_attr_default(o_ptr); /* Multi-hued attr */ - if (!avoid_other && (k_info.at(o_ptr->k_idx).flags & TR_ATTR_MULTI)) + if (!avoid_other && (o_ptr->k_ptr->flags & TR_ATTR_MULTI)) { *ap = get_shimmer_color(); } @@ -3909,7 +3907,7 @@ void wiz_lite() object_type *o_ptr = &o_list[i]; /* Skip dead objects */ - if (!o_ptr->k_idx) continue; + if (!o_ptr->k_ptr) continue; /* Skip held objects */ if (o_ptr->held_m_idx) continue; @@ -4020,7 +4018,7 @@ void wiz_dark() object_type *o_ptr = &o_list[i]; /* Skip dead objects */ - if (!o_ptr->k_idx) continue; + if (!o_ptr->k_ptr) continue; /* Skip held objects */ if (o_ptr->held_m_idx) continue; |