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

Codechange: automatic adding of _t to (u)int types, and WChar to char32_t

Browse Source 
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:
Rubidium
2023-05-08 19:01:06 +02:00
committed by rubidium42
parent 4f4810dc28
commit eaae0bb5e7
564 changed files with 4561 additions and 4561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/map_func.h
View File

@@ -32,7 +32,7 @@ private:
struct TileBase {
byte type; ///< The type (bits 4..7), bridges (2..3), rainforest/desert (0..1)
byte height; ///< The height of the northern corner.
uint16 m2; ///< Primarily used for indices to towns, industries and stations
uint16_t m2; ///< Primarily used for indices to towns, industries and stations
byte m1; ///< Primarily used for ownership information
byte m3; ///< General purpose
byte m4; ///< General purpose
@@ -48,7 +48,7 @@ private:
struct TileExtended {
byte m6; ///< General purpose
byte m7; ///< Primarily used for newgrf support
uint16 m8; ///< General purpose
uint16_t m8; ///< General purpose
};
static TileBase *base_tiles; ///< Pointer to the tile-array.
@@ -120,9 +120,9 @@ public:
*
* Look at docs/landscape.html for the exact meaning of the data.
* @param tile The tile to get the data for.
* @return reference to the uint16 holding the data.
* @return reference to the uint16_t holding the data.
*/
debug_inline uint16 &m2()
debug_inline uint16_t &m2()
{
return base_tiles[tile].m2;
}
@@ -192,9 +192,9 @@ public:
*
* Look at docs/landscape.html for the exact meaning of the data.
* @param tile The tile to get the data for.
* @return reference to the uint16 holding the data.
* @return reference to the uint16_t holding the data.
*/
debug_inline uint16 &m8()
debug_inline uint16_t &m8()
{
return extended_tiles[tile].m8;
}
@@ -373,7 +373,7 @@ public:
*
* @see TileDiffXY(int, int)
*/
typedef int32 TileIndexDiff;
typedef int32_t TileIndexDiff;
/**
* Returns the TileIndex of a coordinate.
@@ -643,7 +643,7 @@ bool CircularTileSearch(TileIndex *tile, uint radius, uint w, uint h, TestTileOn
* @param r the random 'seed'
* @return a valid tile
*/
static inline TileIndex RandomTileSeed(uint32 r)
static inline TileIndex RandomTileSeed(uint32_t r)
{
return Map::WrapToMap(r);
}