dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/livery.h
View File

@@ -13,12 +13,12 @@
#include "company_type.h"
#include "gfx_type.h"
static const byte LIT_NONE = 0; ///< Don't show the liveries at all
static const byte LIT_COMPANY = 1; ///< Show the liveries of your own company
static const byte LIT_ALL = 2; ///< Show the liveries of all companies
static const uint8_t LIT_NONE = 0; ///< Don't show the liveries at all
static const uint8_t LIT_COMPANY = 1; ///< Show the liveries of your own company
static const uint8_t LIT_ALL = 2; ///< Show the liveries of all companies
/** List of different livery schemes. */
enum LiveryScheme {
enum LiveryScheme : uint8_t {
LS_BEGIN = 0,
LS_DEFAULT = 0,
@@ -59,10 +59,10 @@ enum LiveryScheme {
DECLARE_POSTFIX_INCREMENT(LiveryScheme)
/** Helper information for extract tool. */
template <> struct EnumPropsT<LiveryScheme> : MakeEnumPropsT<LiveryScheme, byte, LS_BEGIN, LS_END, LS_END, 8> {};
template <> struct EnumPropsT<LiveryScheme> : MakeEnumPropsT<LiveryScheme, uint8_t, LS_BEGIN, LS_END, LS_END, 8> {};
/** List of different livery classes, used only by the livery GUI. */
enum LiveryClass : byte {
enum LiveryClass : uint8_t {
LC_OTHER,
LC_RAIL,
LC_ROAD,
@@ -78,7 +78,7 @@ DECLARE_ENUM_AS_ADDABLE(LiveryClass)
/** Information about a particular livery. */
struct Livery {
byte in_use; ///< Bit 0 set if this livery should override the default livery first colour, Bit 1 for the second colour.
uint8_t in_use; ///< Bit 0 set if this livery should override the default livery first colour, Bit 1 for the second colour.
Colours colour1; ///< First colour, for all vehicles.
Colours colour2; ///< Second colour, for vehicles with 2CC support.
};