diff options
author | Manoj Srivastava <srivasta@debian.org> | 2020-05-22 20:05:37 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-22 21:39:31 -0700 |
commit | 035291b7f18974925f9a85a41e057bdc462c75f1 (patch) | |
tree | d69056be1a045aec185393b52dadb6fc2d5f50c9 /src/store_action_type.hpp | |
parent | 9714b44a37dfc03aa00187726beea7ed8257415e (diff) | |
parent | 4e9b9c402ed95bf9a17fd6d795bc49bb4128a6fa (diff) |
Merge branch 'upstream'
Diffstat (limited to 'src/store_action_type.hpp')
-rw-r--r-- | src/store_action_type.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/store_action_type.hpp b/src/store_action_type.hpp index 048e13a0..ee479375 100644 --- a/src/store_action_type.hpp +++ b/src/store_action_type.hpp @@ -7,11 +7,11 @@ */ struct store_action_type { - const char *name; /* Name */ + std::string name; /* Name */ - s16b costs[3]; /* Costs for liked people */ - char letter; /* Action letter */ - char letter_aux; /* Action letter */ - s16b action; /* Action code */ - s16b action_restr; /* Action restriction */ + std::array<s16b, 3> costs { }; /* Costs for liked people */ + char letter = '\0'; /* Action letter */ + char letter_aux = '\0'; /* Action letter */ + s16b action = 0; /* Action code */ + s16b action_restr = 0; /* Action restriction */ }; |