summaryrefslogtreecommitdiff
path: root/src/xtra2.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-10-05 18:45:08 +0200
committerBardur Arantsson <bardur@scientician.net>2016-10-05 18:49:38 +0200
commit1bbed63b66c0f69809e698576a51501150f06bba (patch)
treef458361c0c2e7dac2502b1aace63d83d5dbd15b4 /src/xtra2.cc
parentb9fca0267b1d6a32d57e1fb4387f52c19d1c3fa6 (diff)
Move k_info into GameEditData
Diffstat (limited to 'src/xtra2.cc')
-rw-r--r--src/xtra2.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/xtra2.cc b/src/xtra2.cc
index af25e906..bb757b4f 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -3900,6 +3900,7 @@ static int target_set_aux(int y, int x, int mode, cptr info)
auto const &st_info = game->edit_data.st_info;
auto const &wf_info = game->edit_data.wf_info;
auto const &f_info = game->edit_data.f_info;
+ auto const &k_info = game->edit_data.k_info;
cave_type *c_ptr = &cave[y][x];
@@ -5004,13 +5005,15 @@ void set_grace(s32b v)
static bool_ test_object_wish(char *name, object_type *o_ptr, object_type *forge, const char *what)
{
+ auto &k_info = game->edit_data.k_info;
+
int i, j, jb, save_aware;
char buf[200];
/* try all objects, this *IS* a very ugly and slow method :( */
- for (i = 0; i < max_k_idx; i++)
+ for (i = 0; i < k_info.size(); i++)
{
- object_kind *k_ptr = &k_info[i];
+ auto k_ptr = &k_info[i];
o_ptr = forge;