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

30
src/spriteloader/grf.cpp
View File

@@ -57,7 +57,7 @@ static bool WarnCorruptSprite(const SpriteFile &file, size_t file_pos, int line)
* @param container_format Container format of the GRF this sprite is in.
* @return True if the sprite was successfully loaded.
*/
bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, int64 num, byte type, ZoomLevel zoom_lvl, byte colour_fmt, byte container_format)
bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, int64_t num, byte type, ZoomLevel zoom_lvl, byte colour_fmt, byte container_format)
{
/*
* Original sprite height was max 255 pixels, with 4x extra zoom => 1020 pixels.
@@ -70,11 +70,11 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
std::unique_ptr<byte[]> dest_orig(new byte[num]);
byte *dest = dest_orig.get();
const int64 dest_size = num;
const int64_t dest_size = num;
/* Read the file, which has some kind of compression */
while (num > 0) {
int8 code = file.ReadByte();
int8_t code = file.ReadByte();
if (code >= 0) {
/* Plain bytes to read */
@@ -177,7 +177,7 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
} while (!last_item);
}
} else {
int64 sprite_size = static_cast<int64>(sprite->width) * sprite->height * bpp;
int64_t sprite_size = static_cast<int64_t>(sprite->width) * sprite->height * bpp;
if (dest_size < sprite_size) {
return WarnCorruptSprite(file, file_pos, __LINE__);
}
@@ -215,7 +215,7 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
return true;
}
uint8 LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp)
uint8_t LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp)
{
/* Check the requested colour depth. */
if (load_32bpp) return 0;
@@ -256,7 +256,7 @@ uint8 LoadSpriteV1(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, siz
return 0;
}
uint8 LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16 control_flags, uint8 zoom_levels)
uint8_t LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16_t control_flags, uint8_t zoom_levels)
{
static const ZoomLevel zoom_lvl_map[6] = {ZOOM_LVL_OUT_4X, ZOOM_LVL_NORMAL, ZOOM_LVL_OUT_2X, ZOOM_LVL_OUT_8X, ZOOM_LVL_OUT_16X, ZOOM_LVL_OUT_32X};
@@ -266,8 +266,8 @@ uint8 LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, siz
/* clamp to first 6 zoom levels, as in zoom_lvl_map */
zoom_levels &= 0x3F;
uint8 available_levels = GB(control_flags, load_32bpp ? SCC_32BPP_ZOOM_START : SCC_PAL_ZOOM_START, 6);
uint8 skip_levels = 0;
uint8_t available_levels = GB(control_flags, load_32bpp ? SCC_32BPP_ZOOM_START : SCC_PAL_ZOOM_START, 6);
uint8_t skip_levels = 0;
ZoomLevel zoom_min = sprite_type == SpriteType::Font ? ZOOM_LVL_NORMAL : _settings_client.gui.sprite_zoom_min;
if (unlikely(sprite_type == SpriteType::MapGen)) {
@@ -284,14 +284,14 @@ uint8 LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, siz
if (zoom_levels == 0) {
skip_levels = available_levels;
} else if (zoom_levels != 0x3F) {
uint8 keep_levels = 0;
for (uint8 bit : SetBitIterator(zoom_levels)) {
uint8_t keep_levels = 0;
for (uint8_t bit : SetBitIterator(zoom_levels)) {
if (HasBit(available_levels, bit)) {
SetBit(keep_levels, bit);
continue;
}
uint8 below = ((1 << bit) - 1) & available_levels;
uint8_t below = ((1 << bit) - 1) & available_levels;
if (below != 0) {
SetBit(keep_levels, FindLastBit(below));
} else {
@@ -305,11 +305,11 @@ uint8 LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, siz
/* Open the right file and go to the correct position */
file.SeekTo(file_pos, SEEK_SET);
uint32 id = file.ReadDword();
uint32_t id = file.ReadDword();
uint8 loaded_sprites = 0;
uint8_t loaded_sprites = 0;
do {
int64 num = file.ReadDword();
int64_t num = file.ReadDword();
size_t start_pos = file.GetPos();
byte type = file.ReadByte();
@@ -404,7 +404,7 @@ uint8 LoadSpriteV2(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, siz
return loaded_sprites;
}
uint8 SpriteLoaderGrf::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16 control_flags, uint8 zoom_levels)
uint8_t SpriteLoaderGrf::LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16_t control_flags, uint8_t zoom_levels)
{
if (this->container_ver >= 2) {
return LoadSpriteV2(sprite, file, file_pos, sprite_type, load_32bpp, count, control_flags, zoom_levels);

2
src/spriteloader/grf.hpp
View File

@@ -17,7 +17,7 @@ class SpriteLoaderGrf FINAL : public SpriteLoader {
byte container_ver;
public:
SpriteLoaderGrf(byte container_ver) : container_ver(container_ver) {}
uint8 LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16 control_flags, uint8 zoom_levels) override;
uint8_t LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16_t control_flags, uint8_t zoom_levels) override;
};
#endif /* SPRITELOADER_GRF_HPP */

2
src/spriteloader/sprite_file_type.hpp
View File

@@ -12,7 +12,7 @@
#include "../random_access_file_type.h"
enum SpriteFileFlags : uint8 {
enum SpriteFileFlags : uint8_t {
SFF_NONE = 0,
SFF_USERGRF = 1 << 0,
SFF_PROGSIG = 1 << 1,

20
src/spriteloader/spriteloader.hpp
View File

@@ -33,11 +33,11 @@ class SpriteLoader {
public:
/** Definition of a common pixel in OpenTTD's realm. */
struct CommonPixel {
uint8 r; ///< Red-channel
uint8 g; ///< Green-channel
uint8 b; ///< Blue-channel
uint8 a; ///< Alpha-channel
uint8 m; ///< Remap-channel
uint8_t r; ///< Red-channel
uint8_t g; ///< Green-channel
uint8_t b; ///< Blue-channel
uint8_t a; ///< Alpha-channel
uint8_t m; ///< Remap-channel
};
/**
@@ -47,10 +47,10 @@ public:
* This to prevent thousands of malloc + frees just to load a sprite.
*/
struct Sprite {
uint16 height; ///< Height of the sprite
uint16 width; ///< Width of the sprite
int16 x_offs; ///< The x-offset of where the sprite will be drawn
int16 y_offs; ///< The y-offset of where the sprite will be drawn
uint16_t height; ///< Height of the sprite
uint16_t width; ///< Width of the sprite
int16_t x_offs; ///< The x-offset of where the sprite will be drawn
int16_t y_offs; ///< The y-offset of where the sprite will be drawn
SpriteType type; ///< The sprite type
SpriteColourComponent colours; ///< The colour components of the sprite with useful information.
SpriteLoader::CommonPixel *data; ///< The sprite itself
@@ -81,7 +81,7 @@ public:
* @param control_flags Control flags, see SpriteCacheCtrlFlags.
* @return Bit mask of the zoom levels successfully loaded or 0 if no sprite could be loaded.
*/
virtual uint8 LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16 control_flags, uint8 zoom_levels) = 0;
virtual uint8_t LoadSprite(SpriteLoader::SpriteCollection &sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, uint count, uint16_t control_flags, uint8_t zoom_levels) = 0;
virtual ~SpriteLoader() = default;
};