From 57bb453a15034c67d04496360b306a5f3bfd0bf2 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Wed, 5 Oct 2016 18:45:08 +0200 Subject: Move a_info into GameEditData --- src/cmd4.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/cmd4.cc') diff --git a/src/cmd4.cc b/src/cmd4.cc index 4ebb73d0..26794840 100644 --- a/src/cmd4.cc +++ b/src/cmd4.cc @@ -3025,19 +3025,17 @@ void do_cmd_save_screen(void) void do_cmd_knowledge_artifacts(void) { auto const &k_info = game->edit_data.k_info; + auto const &a_info = game->edit_data.a_info; int i, z, x, y; char base_name[80]; /* Scan the artifacts */ - std::unique_ptr okay(new bool_[max_a_idx]); - for (std::size_t k = 0; k < max_a_idx; k++) + std::vector okay(a_info.size(), FALSE); + for (std::size_t k = 0; k < a_info.size(); k++) { - artifact_type *a_ptr = &a_info[k]; - - /* Default */ - okay[k] = FALSE; + auto a_ptr = &a_info[k]; /* Skip "empty" artifacts */ if (!a_ptr->name) continue; @@ -3163,9 +3161,9 @@ void do_cmd_knowledge_artifacts(void) fmt::MemoryWriter w; /* Scan the artifacts */ - for (std::size_t k = 0; k < max_a_idx; k++) + for (std::size_t k = 0; k < a_info.size(); k++) { - artifact_type *a_ptr = &a_info[k]; + auto a_ptr = &a_info[k]; /* List "dead" ones */ if (!okay[k]) continue; -- cgit v1.2.3