summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Pigott <charlespigott@googlemail.com>2020-06-27 13:59:15 +0100
committerCharles Pigott <charlespigott@googlemail.com>2020-06-27 14:51:14 +0100
commitdc8d0089e95a0fb9a77330fe890f72ac3bb430ea (patch)
treec3b9d4dc9d2cf6e4a2ba74fff2fbb78c91f15297 /src
parent887b912af123b5a9bf2339a98e724afe99e6a03d (diff)
downloadopenttd-dc8d0089e95a0fb9a77330fe890f72ac3bb430ea.tar.xz
Codechange: Make sure script enums are the same size as their normal counterparts
Diffstat (limited to 'src')
-rw-r--r--src/script/api/script_company.hpp2
-rw-r--r--src/script/api/script_goal.hpp2
-rw-r--r--src/script/api/script_rail.hpp2
-rw-r--r--src/script/api/script_road.hpp2
-rw-r--r--src/script/api/script_story_page.hpp6
5 files changed, 7 insertions, 7 deletions
diff --git a/src/script/api/script_company.hpp b/src/script/api/script_company.hpp
index ed1d78f1e..ea2f0cdd1 100644
--- a/src/script/api/script_company.hpp
+++ b/src/script/api/script_company.hpp
@@ -99,7 +99,7 @@ public:
* Types of expenses.
* @api -ai
*/
- enum ExpensesType {
+ enum ExpensesType : byte {
EXPENSES_CONSTRUCTION = ::EXPENSES_CONSTRUCTION, ///< Construction costs.
EXPENSES_NEW_VEHICLES = ::EXPENSES_NEW_VEHICLES, ///< New vehicles.
EXPENSES_TRAIN_RUN = ::EXPENSES_TRAIN_RUN, ///< Running costs trains.
diff --git a/src/script/api/script_goal.hpp b/src/script/api/script_goal.hpp
index 372d6e8b4..2261dcc00 100644
--- a/src/script/api/script_goal.hpp
+++ b/src/script/api/script_goal.hpp
@@ -36,7 +36,7 @@ public:
/**
* Goal types that can be given to a goal.
*/
- enum GoalType {
+ enum GoalType : byte {
/* Note: these values represent part of the in-game GoalType enum */
GT_NONE = ::GT_NONE, ///< Destination is not linked.
GT_TILE = ::GT_TILE, ///< Destination is a tile.
diff --git a/src/script/api/script_rail.hpp b/src/script/api/script_rail.hpp
index f82765a70..ec056dacb 100644
--- a/src/script/api/script_rail.hpp
+++ b/src/script/api/script_rail.hpp
@@ -40,7 +40,7 @@ public:
/**
* Types of rail known to the game.
*/
- enum RailType {
+ enum RailType : byte {
/* Note: these values represent part of the in-game static values */
RAILTYPE_INVALID = ::INVALID_RAILTYPE, ///< Invalid RailType.
};
diff --git a/src/script/api/script_road.hpp b/src/script/api/script_road.hpp
index 5a952d91a..64b783386 100644
--- a/src/script/api/script_road.hpp
+++ b/src/script/api/script_road.hpp
@@ -60,7 +60,7 @@ public:
/**
* Road/tram types
*/
- enum RoadTramTypes {
+ enum RoadTramTypes : uint8 {
ROADTRAMTYPES_ROAD = ::RTTB_ROAD, ///< Road road types.
ROADTRAMTYPES_TRAM = ::RTTB_TRAM, ///< Tram road types.
};
diff --git a/src/script/api/script_story_page.hpp b/src/script/api/script_story_page.hpp
index 23e4e03b1..c87ef7cb3 100644
--- a/src/script/api/script_story_page.hpp
+++ b/src/script/api/script_story_page.hpp
@@ -57,7 +57,7 @@ public:
/**
* Story page element types.
*/
- enum StoryPageElementType {
+ enum StoryPageElementType : byte {
SPET_TEXT = ::SPET_TEXT, ///< An element that displays a block of text.
SPET_LOCATION = ::SPET_LOCATION, ///< An element that displays a single line of text along with a button to view the referenced location.
SPET_GOAL = ::SPET_GOAL, ///< An element that displays a goal.
@@ -75,7 +75,7 @@ public:
* Formatting and layout flags for story page buttons.
* The SPBF_FLOAT_LEFT and SPBF_FLOAT_RIGHT flags can not be combined.
*/
- enum StoryPageButtonFlags {
+ enum StoryPageButtonFlags : byte {
SPBF_NONE = ::SPBF_NONE, ///< No special formatting for button.
SPBF_FLOAT_LEFT = ::SPBF_FLOAT_LEFT, ///< Button is placed to the left of the following paragraph.
SPBF_FLOAT_RIGHT = ::SPBF_FLOAT_RIGHT, ///< Button is placed to the right of the following paragraph.
@@ -84,7 +84,7 @@ public:
/**
* Mouse cursors usable by story page buttons.
*/
- enum StoryPageButtonCursor {
+ enum StoryPageButtonCursor : byte {
SPBC_MOUSE = ::SPBC_MOUSE,
SPBC_ZZZ = ::SPBC_ZZZ,
SPBC_BUOY = ::SPBC_BUOY,