diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:13 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-09-17 09:58:13 +0200 |
commit | a303c1a21930025c4f5ec086733f5d936d54f326 (patch) | |
tree | 28650448eba3e00b81f74d850877aaff3ae7f820 /src | |
parent | 68d77669646e9a51bb622bdced5be948c58791e2 (diff) |
Change meta_class_type to non-POD type
Diffstat (limited to 'src')
-rw-r--r-- | src/init2.cc | 2 | ||||
-rw-r--r-- | src/meta_class_type.hpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/init2.cc b/src/init2.cc index 5a4662a0..67c9d37f 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -555,7 +555,7 @@ namespace { race_mod_info = new player_race_mod[max_rmp_idx]; class_info = new player_class[max_c_idx]; bg = make_array<hist_type>(max_bg_idx); - meta_class_info = make_array<meta_class_type>(max_mc_idx); + meta_class_info = new meta_class_type[max_mc_idx]; for (std::size_t i = 0; i < max_mc_idx; i++) { meta_class_info[i].classes = make_array<s16b>(max_c_idx); diff --git a/src/meta_class_type.hpp b/src/meta_class_type.hpp index e74e75b3..243b0ad4 100644 --- a/src/meta_class_type.hpp +++ b/src/meta_class_type.hpp @@ -4,7 +4,7 @@ struct meta_class_type { - char name[80]; /* Name */ - byte color; - s16b *classes; /* list of classes */ + char name[80] = ""; /* Name */ + byte color = 0; + s16b *classes = nullptr; /* List of classes */ }; |