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:
@@ -86,7 +86,7 @@ typedef void *OffsetProc(void *base);
|
||||
|
||||
struct OldChunks {
|
||||
OldChunkType type; ///< Type of field
|
||||
uint32 amount; ///< Amount of fields
|
||||
uint32_t amount; ///< Amount of fields
|
||||
|
||||
void *ptr; ///< Pointer where to save the data (takes precedence over #offset)
|
||||
OffsetProc *offset; ///< Pointer to function that returns the actual memory address of a member (ignored if #ptr is not nullptr)
|
||||
@@ -103,15 +103,15 @@ bool LoadChunk(LoadgameState *ls, void *base, const OldChunks *chunks);
|
||||
bool LoadTTDMain(LoadgameState *ls);
|
||||
bool LoadTTOMain(LoadgameState *ls);
|
||||
|
||||
static inline uint16 ReadUint16(LoadgameState *ls)
|
||||
static inline uint16_t ReadUint16(LoadgameState *ls)
|
||||
{
|
||||
byte x = ReadByte(ls);
|
||||
return x | ReadByte(ls) << 8;
|
||||
}
|
||||
|
||||
static inline uint32 ReadUint32(LoadgameState *ls)
|
||||
static inline uint32_t ReadUint32(LoadgameState *ls)
|
||||
{
|
||||
uint16 x = ReadUint16(ls);
|
||||
uint16_t x = ReadUint16(ls);
|
||||
return x | ReadUint16(ls) << 16;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user