diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-21 22:59:26 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | 09567bf0b3c6b4e07bdf6ca68286fc302cdcdf69 (patch) | |
| tree | 97ed2a20092cd67a18cdc0713d38e23979adb5f8 | |
| parent | f20b75d712c377c1ec639080e38fddb93b83883c (diff) | |
| download | openttd-09567bf0b3c6b4e07bdf6ca68286fc302cdcdf69.tar.xz | |
Codechange: Remove StoryPageElementTypeByte type
| -rw-r--r-- | src/story_base.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/story_base.h b/src/story_base.h index 139c41dab..221dcafdf 100644 --- a/src/story_base.h +++ b/src/story_base.h @@ -27,7 +27,7 @@ extern uint32 _story_page_next_sort_value; /* * Each story page element is one of these types. */ -enum StoryPageElementType { +enum StoryPageElementType : byte { SPET_TEXT = 0, ///< A text element. SPET_LOCATION, ///< An element that references a tile along with a one-line text. SPET_GOAL, ///< An element that references a goal. @@ -37,7 +37,6 @@ enum StoryPageElementType { /** Define basic enum properties */ template <> struct EnumPropsT<StoryPageElementType> : MakeEnumPropsT<StoryPageElementType, byte, SPET_TEXT, SPET_END, INVALID_SPET, 8> {}; -typedef TinyEnumT<StoryPageElementType> StoryPageElementTypeByte; ///< typedefing-enumification of Direction /** * Struct about story page elements. @@ -47,7 +46,7 @@ typedef TinyEnumT<StoryPageElementType> StoryPageElementTypeByte; ///< typedefin struct StoryPageElement : StoryPageElementPool::PoolItem<&_story_page_element_pool> { uint32 sort_value; ///< A number that increases for every created story page element. Used for sorting. The id of a story page element is the pool index. StoryPageID page; ///< Id of the page which the page element belongs to - StoryPageElementTypeByte type; ///< Type of page element + StoryPageElementType type; ///< Type of page element uint32 referenced_id; ///< Id of referenced object (location, goal etc.) char *text; ///< Static content text of page element |