diff options
author | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 21:17:20 +0200 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2016-06-21 21:17:20 +0200 |
commit | ebc402cfa4182a50f46ac2d56e3b74c5372eed84 (patch) | |
tree | b0adc76887806436aff2f8a11b5889a2ed183f1f /src/feature_type.hpp | |
parent | 71742f41caf3721e993f169b9259e29e26f566cf (diff) |
Change feature_type to non-POD type
Diffstat (limited to 'src/feature_type.hpp')
-rw-r--r-- | src/feature_type.hpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/feature_type.hpp b/src/feature_type.hpp index 54975269..40a1f58b 100644 --- a/src/feature_type.hpp +++ b/src/feature_type.hpp @@ -7,26 +7,26 @@ */ struct feature_type { - char *name; /* Name */ + char *name = nullptr; /* 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! */ + 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! */ - byte mimic; /* Feature to mimic */ + byte mimic = 0; /* Feature to mimic */ - u32b flags1; /* First set of flags */ + u32b flags1 = 0; /* First set of flags */ - byte d_attr; /* Default feature attribute */ - char d_char; /* Default feature character */ + 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 */ }; |