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

Merge branch 'master' into jgrpp

Browse Source 
Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
parent f1c0f864f5 6c5a8f55df
commit 18a42664fc
376 changed files with 2220 additions and 2152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/train_cmd.cpp
View File

@@ -144,8 +144,8 @@ inline void ClearLookAheadIfInvalid(Train *v)
if (v->lookahead != nullptr && !ValidateLookAhead(v)) v->lookahead.reset();
}
static const byte _vehicle_initial_x_fract[4] = {10, 8, 4, 8};
static const byte _vehicle_initial_y_fract[4] = { 8, 4, 8, 10};
static const uint8_t _vehicle_initial_x_fract[4] = {10, 8, 4, 8};
static const uint8_t _vehicle_initial_y_fract[4] = { 8, 4, 8, 10};
template <>
bool IsValidImageIndex<VEH_TRAIN>(uint8_t image_index)
@@ -159,7 +159,7 @@ bool IsValidImageIndex<VEH_TRAIN>(uint8_t image_index)
* @param cargo Cargo type to get multiplier for
* @return Cargo weight multiplier
*/
byte FreightWagonMult(CargoID cargo)
uint8_t FreightWagonMult(CargoID cargo)
{
if (!CargoSpec::Get(cargo)->is_freight) return 1;
return _settings_game.vehicle.freight_trains;
@@ -3793,7 +3793,7 @@ void FreeTrainTrackReservation(Train *v, TileIndex origin, Trackdir orig_td)
}
}
static const byte _initial_tile_subcoord[6][4][3] = {
static const uint8_t _initial_tile_subcoord[6][4][3] = {
{{ 15, 8, 1 }, { 0, 0, 0 }, { 0, 8, 5 }, { 0, 0, 0 }},
{{ 0, 0, 0 }, { 8, 0, 3 }, { 0, 0, 0 }, { 8, 15, 7 }},
{{ 0, 0, 0 }, { 7, 0, 2 }, { 0, 7, 6 }, { 0, 0, 0 }},
@@ -4916,10 +4916,10 @@ static inline bool CheckCompatibleRail(const Train *v, TileIndex tile, DiagDirec
/** Data structure for storing engine speed changes of an acceleration type. */
struct AccelerationSlowdownParams {
byte small_turn; ///< Speed change due to a small turn.
byte large_turn; ///< Speed change due to a large turn.
byte z_up; ///< Fraction to remove when moving up.
byte z_down; ///< Fraction to add when moving down.
uint8_t small_turn; ///< Speed change due to a small turn.
uint8_t large_turn; ///< Speed change due to a large turn.
uint8_t z_up; ///< Fraction to remove when moving up.
uint8_t z_down; ///< Fraction to add when moving down.
};
/** Speed update fractions for each acceleration type. */
@@ -5594,7 +5594,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
}
if (old_direction != v->direction) notify_direction_changed(old_direction, v->direction);
DiagDirection dir = GetTunnelBridgeDirection(gp.old_tile);
const byte *b = _initial_tile_subcoord[AxisToTrack(DiagDirToAxis(dir))][dir];
const uint8_t *b = _initial_tile_subcoord[AxisToTrack(DiagDirToAxis(dir))][dir];
gp.x = (gp.x & ~0xF) | b[0];
gp.y = (gp.y & ~0xF) | b[1];
}
@@ -5780,7 +5780,7 @@ bool TrainController(Train *v, Vehicle *nomove, bool reverse)
chosen_track == TRACK_BIT_LEFT || chosen_track == TRACK_BIT_RIGHT);
/* Update XY to reflect the entrance to the new tile, and select the direction to use */
const byte *b = _initial_tile_subcoord[FindFirstBit(chosen_track)][enterdir];
const uint8_t *b = _initial_tile_subcoord[FindFirstBit(chosen_track)][enterdir];
gp.x = (gp.x & ~0xF) | b[0];
gp.y = (gp.y & ~0xF) | b[1];
Direction chosen_dir = (Direction)b[2];