diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2015-06-12 06:27:05 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2015-08-01 17:26:10 +0200 |
| commit | c6196b25d119a10e79deedef26a73e0d5a021b0e (patch) | |
| tree | 199f5bff5cf363787eb610caa495fd3682a463ed /src/cmd4.cc | |
| parent | 000f6272f8ab1d43ec6300fb5972f7813ada1c88 (diff) | |
Refactor cave_type and monster_type to use non-intrusive lists
We use vectors of object indexes instead of embedding the list within
object_type itself.
Diffstat (limited to 'src/cmd4.cc')
| -rw-r--r-- | src/cmd4.cc | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/cmd4.cc b/src/cmd4.cc index d857c1a0..c18718ae 100644 --- a/src/cmd4.cc +++ b/src/cmd4.cc @@ -3091,18 +3091,11 @@ void do_cmd_knowledge_artifacts(void) { cave_type *c_ptr = &cave[y][x]; - s16b this_o_idx, next_o_idx = 0; - /* Scan all objects in the grid */ - for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) + for (auto const this_o_idx: c_ptr->o_idxs) { - object_type * o_ptr; - /* Acquire object */ - o_ptr = &o_list[this_o_idx]; - - /* Acquire next object */ - next_o_idx = o_ptr->next_o_idx; + object_type const * o_ptr = &o_list[this_o_idx]; /* Ignore random artifacts */ if (o_ptr->tval == TV_RANDART) continue; @@ -3129,21 +3122,14 @@ void do_cmd_knowledge_artifacts(void) /* Check monsters in the dungeon */ for (i = 0; i < m_max; i++) { - monster_type *m_ptr = &m_list[i]; - - s16b this_o_idx, next_o_idx = 0; - /* Scan all objects the monster carries */ - for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx) + for (auto const this_o_idx: m_list[i].hold_o_idxs) { object_type * o_ptr; /* Acquire object */ o_ptr = &o_list[this_o_idx]; - /* Acquire next object */ - next_o_idx = o_ptr->next_o_idx; - /* Ignore random artifacts */ if (o_ptr->tval == TV_RANDART) continue; |