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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/smallmap_colours.h
View File

@@ -34,20 +34,20 @@
/** Colour scheme of the smallmap. */
struct SmallMapColourScheme {
uint32 *height_colours; ///< Cached colours for each level in a map.
const uint32 *height_colours_base; ///< Base table for determining the colours
size_t colour_count; ///< The number of colours.
uint32 default_colour; ///< Default colour of the land.
uint32_t *height_colours; ///< Cached colours for each level in a map.
const uint32_t *height_colours_base; ///< Base table for determining the colours
size_t colour_count; ///< The number of colours.
uint32_t default_colour; ///< Default colour of the land.
};
extern SmallMapColourScheme _heightmap_schemes[];
struct AndOr {
uint32 mor;
uint32 mand;
uint32_t mor;
uint32_t mand;
};
inline uint32 ApplyMask(uint32 colour, const AndOr *mask)
inline uint32_t ApplyMask(uint32_t colour, const AndOr *mask)
{
return (colour & mask->mand) | mask->mor;
}
@@ -84,7 +84,7 @@ static const AndOr _smallmap_vehicles_andor[] = {
{MKCOLOUR_0XX0(PC_BLACK ), MKCOLOUR_F00F},
};
static const uint32 _vegetation_clear_bits[] = {
static const uint32_t _vegetation_clear_bits[] = {
MKCOLOUR_XXXX(PC_GRASS_LAND), ///< full grass
MKCOLOUR_XXXX(PC_ROUGH_LAND), ///< rough land
MKCOLOUR_XXXX(PC_GREY), ///< rocks