diff options
Diffstat (limited to 'src/feature_type.hpp')
| -rw-r--r-- | src/feature_type.hpp | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/src/feature_type.hpp b/src/feature_type.hpp index 1a79aeb3..e818f17a 100644 --- a/src/feature_type.hpp +++ b/src/feature_type.hpp @@ -2,36 +2,33 @@ #include "h-basic.h" +#include "feature_flag_set.hpp" + /** * Terrain feature descriptor. */ struct feature_type { - char *name; /* Name */ - - const char *text; /* Text. May point to shared read-only memory, DO NOT FREE! */ - const char *tunnel; /* Text for tunneling. May point to shared read-only memory, DO NOT FREE! */ - const char *block; /* Text for blocking. May point to shared read-only memory, DO NOT FREE! */ - - byte mimic; /* Feature to mimic */ - - u32b flags1; /* First set of flags */ + char *name = nullptr; /* Name */ - byte extra; /* Extra byte (unused) */ + const char *text = nullptr; /* Text. May point to shared read-only memory, DO NOT FREE! */ + const char *tunnel = nullptr; /* Text for tunneling. May point to shared read-only memory, DO NOT FREE! */ + const char *block = nullptr; /* Text for blocking. May point to shared read-only memory, DO NOT FREE! */ - s16b unused; /* Extra bytes (unused) */ + byte mimic = 0; /* Feature to mimic */ - byte d_attr; /* Default feature attribute */ - char d_char; /* Default feature character */ + feature_flag_set flags; /* First set of flags */ + byte d_attr = 0; /* Default feature attribute */ + char d_char = '\0'; /* Default feature character */ - byte x_attr; /* Desired feature attribute */ - char x_char; /* Desired feature character */ + byte x_attr = 0; /* Desired feature attribute */ + char x_char = '\0'; /* Desired feature character */ - byte shimmer[7]; /* Shimmer colors */ + byte shimmer[7]; /* Shimmer colors */ - int d_dice[4]; /* Number of dices */ - int d_side[4]; /* Number of sides */ - int d_frequency[4]; /* Frequency of damage (1 is the minimum) */ - int d_type[4]; /* Type of damage */ + int d_dice[4] = { 0 }; /* Number of dice */ + int d_side[4] = { 0 }; /* Number of sides */ + int d_frequency[4] = { 0 }; /* Frequency of damage (1 is the minimum) */ + int d_type[4] = { 0 }; /* Type of damage */ }; |