summaryrefslogtreecommitdiff
path: root/src/init1.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2016-06-20 22:49:05 +0200
committerBardur Arantsson <bardur@scientician.net>2016-06-20 22:49:05 +0200
commitfc06bedef3f5521a97989ebb6c7160744c640a19 (patch)
tree61b57b4badca81d3c8e03aa57b65f494167685e6 /src/init1.cc
parent8bc99186e42dbb1b1c0b840f982fe3af913c3e14 (diff)
Change set_type to non-POD type
Diffstat (limited to 'src/init1.cc')
-rw-r--r--src/init1.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/init1.cc b/src/init1.cc
index 327faca6..38736f0e 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -3728,8 +3728,6 @@ errr init_set_info_txt(FILE *fp)
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
- int z, y;
-
/* Find the colon before the name */
s = strchr(buf + 2, ':');
@@ -3764,11 +3762,12 @@ errr init_set_info_txt(FILE *fp)
/* Initialize */
set_ptr->num = 0;
set_ptr->num_use = 0;
- for (z = 0; z < 6; z++)
+
+ for (std::size_t z = 0; z < SET_MAX_SIZE; z++)
{
set_ptr->arts[z].a_idx = 0;
set_ptr->arts[z].present = FALSE;
- for (y = 0; y < 6; y++)
+ for (std::size_t y = 0; y < SET_MAX_SIZE; y++)
{
set_ptr->arts[z].flags1[y] = 0;
set_ptr->arts[z].flags2[y] = 0;