diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 09:37:08 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-22 09:54:31 +0200 |
commit | 7bbfa3f27a97c6e0546f53a3254de38e513ed334 (patch) | |
tree | a5391d0c41f08eb103f509f6cb99c8f6ab94a31a /src/store_info_type.hpp | |
parent | 9e04bdd234e09e3e2e50c65ec21688a496ae1c4f (diff) |
Change store_info_type to non-POD type
Diffstat (limited to 'src/store_info_type.hpp')
-rw-r--r-- | src/store_info_type.hpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/store_info_type.hpp b/src/store_info_type.hpp index 6a6efd65..3923438f 100644 --- a/src/store_info_type.hpp +++ b/src/store_info_type.hpp @@ -12,23 +12,23 @@ constexpr int STORE_CHOICES = 56; */ struct store_info_type { - const char *name; /* Name */ + const char *name = nullptr; /* Name */ - s16b item_kind[STORE_CHOICES]; /* Table -- Legal item kinds */ - s16b item_chance[STORE_CHOICES]; - byte item_num; /* Number of items */ + s16b item_kind[STORE_CHOICES] = { 0 }; /* Table -- Legal item kinds */ + s16b item_chance[STORE_CHOICES] = { 0 }; + byte item_num = 0; /* Number of items */ - s16b max_obj; /* Number of items this store can hold */ + s16b max_obj = 0; /* Number of items this store can hold */ - u16b owners[4]; /* List of owners(refers to ow_info) */ + u16b owners[4] = { 0 }; /* List of owners(refers to ow_info) */ - u16b actions[6]; /* Actions(refers to ba_info) */ + u16b actions[6] = { 0 }; /* Actions(refers to ba_info) */ - byte d_attr; /* Default building attribute */ - char d_char; /* Default building character */ + byte d_attr = 0; /* Default building attribute */ + char d_char = '\0'; /* Default building character */ - byte x_attr; /* Desired building attribute */ - char x_char; /* Desired building character */ + byte x_attr = 0; /* Desired building attribute */ + char x_char = '\0'; /* Desired building character */ - u32b flags1; /* Flags */ + u32b flags1 = 0; /* Flags */ }; |