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

12
src/rail.h
View File

@@ -211,22 +211,22 @@ public:
/**
* Cost multiplier for building this rail type
*/
uint16 cost_multiplier;
uint16_t cost_multiplier;
/**
* Cost multiplier for maintenance of this rail type
*/
uint16 maintenance_multiplier;
uint16_t maintenance_multiplier;
/**
* Acceleration type of this rail type
*/
uint8 acceleration_type;
uint8_t acceleration_type;
/**
* Maximum speed for vehicles travelling on this rail type
*/
uint16 max_speed;
uint16_t max_speed;
/**
* Unique 32 bit rail type identifier
@@ -425,7 +425,7 @@ static inline Money RailConvertCost(RailType from, RailType to)
* @param total_num Total number of track bits of all railtypes.
* @return Total cost.
*/
static inline Money RailMaintenanceCost(RailType railtype, uint32 num, uint32 total_num)
static inline Money RailMaintenanceCost(RailType railtype, uint32_t num, uint32_t total_num)
{
assert(railtype < RAILTYPE_END);
return (_price[PR_INFRASTRUCTURE_RAIL] * GetRailTypeInfo(railtype)->maintenance_multiplier * num * (1 + IntSqrt(total_num))) >> 11; // 4 bits fraction for the multiplier and 7 bits scaling.
@@ -436,7 +436,7 @@ static inline Money RailMaintenanceCost(RailType railtype, uint32 num, uint32 to
* @param num Number of signals.
* @return Total cost.
*/
static inline Money SignalMaintenanceCost(uint32 num)
static inline Money SignalMaintenanceCost(uint32_t num)
{
return (_price[PR_INFRASTRUCTURE_RAIL] * 15 * num * (1 + IntSqrt(num))) >> 8; // 1 bit fraction for the multiplier and 7 bits scaling.
}