diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2019-04-22 13:20:24 +0100 |
|---|---|---|
| committer | PeterN <peter@fuzzle.org> | 2019-04-29 17:40:22 +0100 |
| commit | a5681d3ebac3c791c230bffb5eceac00222b2e01 (patch) | |
| tree | b3c9c0185e073b8929fdc846d2968c6cab15c298 /src | |
| parent | 327ff898080d94ab129f6e7ae3c268dcf10d6a08 (diff) | |
| download | openttd-a5681d3ebac3c791c230bffb5eceac00222b2e01.tar.xz | |
Codechange: Remove GoalTypeByte
Diffstat (limited to 'src')
| -rw-r--r-- | src/goal_base.h | 2 | ||||
| -rw-r--r-- | src/goal_type.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/goal_base.h b/src/goal_base.h index 532c47ea3..fee4ddce7 100644 --- a/src/goal_base.h +++ b/src/goal_base.h @@ -22,7 +22,7 @@ extern GoalPool _goal_pool; /** Struct about goals, current and completed */ struct Goal : GoalPool::PoolItem<&_goal_pool> { CompanyID company; ///< Goal is for a specific company; INVALID_COMPANY if it is global - GoalTypeByte type; ///< Type of the goal + GoalType type; ///< Type of the goal GoalTypeID dst; ///< Index of type char *text; ///< Text of the goal. char *progress; ///< Progress text of the goal. diff --git a/src/goal_type.h b/src/goal_type.h index aa9dee349..4321a42b7 100644 --- a/src/goal_type.h +++ b/src/goal_type.h @@ -18,7 +18,7 @@ static const uint32 GOAL_QUESTION_BUTTON_COUNT = 18; ///< Amount of buttons avai static const byte GOAL_QUESTION_TYPE_COUNT = 4; ///< Amount of question types. /** Types of goal destinations */ -enum GoalType { +enum GoalType : byte { GT_NONE, ///< Destination is not linked GT_TILE, ///< Destination is a tile GT_INDUSTRY, ///< Destination is an industry @@ -26,7 +26,6 @@ enum GoalType { GT_COMPANY, ///< Destination is a company GT_STORY_PAGE, ///< Destination is a story page }; -typedef SimpleTinyEnumT<GoalType, byte> GoalTypeByte; ///< The GoalType packed into a byte for savegame purposes. typedef uint32 GoalTypeID; ///< Contains either tile, industry ID, town ID or company ID (or INVALID_GOALTYPE) static const GoalTypeID INVALID_GOALTYPE = 0xFFFFFFFF; ///< Invalid/unknown index of GoalType |