diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 13:37:02 +0200 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 13:37:02 +0200 |
| commit | 073ad3584fbf781ce10bef61ad4ff38850282f47 (patch) | |
| tree | eb2db284b91ad7987655401406a2d57843337875 /src/set_component.hpp | |
| parent | b9e4f471c2e23283945ba9324912c7e29dd8fbd8 (diff) | |
Rework TR{1,2,3,4,5}_* flags to flag_set<>
Diffstat (limited to 'src/set_component.hpp')
| -rw-r--r-- | src/set_component.hpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/set_component.hpp b/src/set_component.hpp index ceb82cbd..18dc4d57 100644 --- a/src/set_component.hpp +++ b/src/set_component.hpp @@ -1,6 +1,7 @@ #pragma once #include "h-basic.h" +#include "object_flag_set.hpp" #include <array> #include <cstdint> @@ -8,13 +9,8 @@ constexpr std::size_t SET_MAX_SIZE = 6; struct set_component { - bool_ present = FALSE; /* Is it actually wore ? */ - s16b a_idx = 0; /* What artifact? */ - std::array<s16b, SET_MAX_SIZE> pval; /* Pval for each combination */ - std::array<u32b, SET_MAX_SIZE> flags1; /* Flags */ - std::array<u32b, SET_MAX_SIZE> flags2; /* Flags */ - std::array<u32b, SET_MAX_SIZE> flags3; /* Flags */ - std::array<u32b, SET_MAX_SIZE> flags4; /* Flags */ - std::array<u32b, SET_MAX_SIZE> flags5; /* Flags */ - std::array<u32b, SET_MAX_SIZE> esp; /* Flags */ + bool_ present = FALSE; /* Is it being worn? */ + s16b a_idx = 0; /* What artifact? */ + std::array<s16b , SET_MAX_SIZE> pval; /* Pval for each combination */ + std::array<object_flag_set, SET_MAX_SIZE> flags; /* Flags */ }; |