diff options
Diffstat (limited to 'src/artifact_type.hpp')
| -rw-r--r-- | src/artifact_type.hpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/artifact_type.hpp b/src/artifact_type.hpp index ea962bc2..8ff53433 100644 --- a/src/artifact_type.hpp +++ b/src/artifact_type.hpp @@ -1,6 +1,7 @@ #pragma once #include "h-basic.h" +#include "object_flag_set.hpp" /** * Artifact descriptor. @@ -34,17 +35,8 @@ struct artifact_type s32b cost = 0; /* Artifact "cost" */ - u32b flags1 = 0; /* Artifact Flags, set 1 */ - u32b flags2 = 0; /* Artifact Flags, set 2 */ - u32b flags3 = 0; /* Artifact Flags, set 3 */ - u32b flags4 = 0; /* Artifact Flags, set 4 */ - u32b flags5 = 0; /* Artifact Flags, set 5 */ - - u32b oflags1 = 0; /* Obvious Flags, set 1 */ - u32b oflags2 = 0; /* Obvious Flags, set 2 */ - u32b oflags3 = 0; /* Obvious Flags, set 3 */ - u32b oflags4 = 0; /* Obvious Flags, set 4 */ - u32b oflags5 = 0; /* Obvious Flags, set 5 */ + object_flag_set flags; /* Artifact Flags */ + object_flag_set oflags; /* Obvious Flags */ byte level = 0; /* Artifact level */ byte rarity = 0; /* Artifact rarity */ @@ -52,9 +44,6 @@ struct artifact_type byte cur_num = 0; /* Number created (0 or 1) */ byte max_num = 0; /* Unused (should be "1") */ - u32b esp = 0; /* ESP flags */ - u32b oesp = 0; /* ESP flags */ - s16b power = 0; /* Power granted, if any */ s16b set = 0; /* Which set does it belong it, if any? */ |