Skip to content

Commit 5657c06

Browse files
committed
Add type alias for event field
1 parent 462ec86 commit 5657c06

File tree

3 files changed

+75
-72
lines changed

3 files changed

+75
-72
lines changed

doc/JSON/JSON_INFO.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2160,9 +2160,11 @@ specification for it in `event.h`:
21602160

21612161
<!-- {% raw %} -->
21622162
```cpp
2163+
using event_field = std::pair<const char *, cata_variant_type>;
2164+
//...
21632165
template<>
21642166
struct event_spec<event_type::gains_skill_level> {
2165-
static constexpr std::array<std::pair<const char *, cata_variant_type>, 3> fields = {{
2167+
static constexpr std::array<event_field, 3> fields = {{
21662168
{ "character", cata_variant_type::character_id },
21672169
{ "skill", cata_variant_type::skill_id },
21682170
{ "new_level", cata_variant_type::int_ },

src/event.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@ namespace event_detail
139139
{
140140

141141
#define DEFINE_EVENT_HELPER_FIELDS(type) \
142-
constexpr std::array<std::pair<const char *, cata_variant_type>, \
143-
type::fields.size()> type::fields;
142+
constexpr std::array<event_field, type::fields.size()> type::fields;
144143

145144
DEFINE_EVENT_HELPER_FIELDS( event_spec_empty )
146145
DEFINE_EVENT_HELPER_FIELDS( event_spec_character )
@@ -152,7 +151,7 @@ static_assert( static_cast<int>( event_type::num_event_types ) == 107,
152151
"its fields definition then you probably don't need a definition here." );
153152

154153
#define DEFINE_EVENT_FIELDS(type) \
155-
constexpr std::array<std::pair<const char *, cata_variant_type>, \
154+
constexpr std::array<event_field, \
156155
event_spec<event_type::type>::fields.size()> \
157156
event_spec<event_type::type>::fields;
158157

0 commit comments

Comments
 (0)