diff options
Diffstat (limited to 'src/set_type.hpp')
| -rw-r--r-- | src/set_type.hpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/set_type.hpp b/src/set_type.hpp index 827c23ac..0a04b384 100644 --- a/src/set_type.hpp +++ b/src/set_type.hpp @@ -1,28 +1,18 @@ #pragma once -#include "h-basic.h" +#include <array> +#include "set_component.hpp" /** * Item set descriptor and runtime information. */ struct set_type { - const char *name; /* Name */ - char *desc; /* Desc */ + const char *name = nullptr; /* Name */ + char *desc = nullptr; /* Desc */ - byte num; /* Number of artifacts used */ - byte num_use; /* Number actually wore */ + byte num = 0; /* Number of artifacts used */ + byte num_use = 0; /* Number actually worn */ - struct /* the various items */ - { - bool_ present; /* Is it actually wore ? */ - s16b a_idx; /* What artifact ? */ - s16b pval[6]; /* Pval for each combination */ - u32b flags1[6]; /* Flags */ - u32b flags2[6]; /* Flags */ - u32b flags3[6]; /* Flags */ - u32b flags4[6]; /* Flags */ - u32b flags5[6]; /* Flags */ - u32b esp[6]; /* Flags */ - } arts[6]; + std::array<set_component, SET_MAX_SIZE> arts; }; |