forked from mirror/OpenTTD
Codechange: automatic adding of _t to (u)int types, and WChar to char32_t
for i in `find src -type f|grep -v 3rdparty/fmt|grep -v 3rdparty/catch2|grep -v 3rdparty/opengl|grep -v stdafx.h`; do sed 's/uint16& /uint16 \&/g;s/int8\([ >*),;[]\)/int8_t\1/g;s/int16\([ >*),;[]\)/int16_t\1/g;s/int32\([ >*),;[]\)/int32_t\1/g;s/int64\([ >*),;[]\)/int64_t\1/g;s/ uint32(/ uint32_t(/g;s/_uint8_t/_uint8/;s/Uint8_t/Uint8/;s/ft_int64_t/ft_int64/g;s/uint64$/uint64_t/;s/WChar/char32_t/g;s/char32_t char32_t/char32_t WChar/' -i $i; done
This commit is contained in:
@@ -15,10 +15,10 @@
|
||||
|
||||
/** Data structure describing a sprite. */
|
||||
struct Sprite {
|
||||
uint16 height; ///< Height of the sprite.
|
||||
uint16 width; ///< Width of the sprite.
|
||||
int16 x_offs; ///< Number of pixels to shift the sprite to the right.
|
||||
int16 y_offs; ///< Number of pixels to shift the sprite downwards.
|
||||
uint16_t height; ///< Height of the sprite.
|
||||
uint16_t width; ///< Width of the sprite.
|
||||
int16_t x_offs; ///< Number of pixels to shift the sprite to the right.
|
||||
int16_t y_offs; ///< Number of pixels to shift the sprite downwards.
|
||||
byte data[]; ///< Sprite data.
|
||||
};
|
||||
|
||||
@@ -39,7 +39,7 @@ bool SpriteExists(SpriteID sprite);
|
||||
|
||||
SpriteType GetSpriteType(SpriteID sprite);
|
||||
SpriteFile *GetOriginFile(SpriteID sprite);
|
||||
uint32 GetSpriteLocalID(SpriteID sprite);
|
||||
uint32_t GetSpriteLocalID(SpriteID sprite);
|
||||
uint GetSpriteCountForFile(const std::string &filename, SpriteID begin, SpriteID end);
|
||||
uint GetMaxSpriteID();
|
||||
|
||||
@@ -64,9 +64,9 @@ void IncreaseSpriteLRU();
|
||||
SpriteFile &OpenCachedSpriteFile(const std::string &filename, Subdirectory subdir, bool palette_remap);
|
||||
|
||||
void ReadGRFSpriteOffsets(SpriteFile &file);
|
||||
size_t GetGRFSpriteOffset(uint32 id);
|
||||
size_t GetGRFSpriteOffset(uint32_t id);
|
||||
bool LoadNextSprite(int load_index, SpriteFile &file, uint file_sprite_id);
|
||||
bool SkipSpriteData(SpriteFile &file, byte type, uint16 num);
|
||||
bool SkipSpriteData(SpriteFile &file, byte type, uint16_t num);
|
||||
void DupSprite(SpriteID old_spr, SpriteID new_spr);
|
||||
|
||||
#endif /* SPRITECACHE_H */
|
||||
|
Reference in New Issue
Block a user