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

4
src/train_gui.cpp
View File

@@ -228,7 +228,7 @@ static void TrainDetailsCargoTab(const CargoSummaryItem *item, int left, int rig
* @param right The right most coordinate to draw
* @param y The y coordinate
*/
static void TrainDetailsInfoTab(const Train *v, int left, int right, int y, byte line_number)
static void TrainDetailsInfoTab(const Train *v, int left, int right, int y, uint8_t line_number)
{
const RailVehicleInfo *rvi = RailVehInfo(v->engine_type);
bool show_speed = !UsesWagonOverride(v) && (_settings_game.vehicle.wagon_speed_limits || rvi->railveh_type != RAILVEH_WAGON);
@@ -425,7 +425,7 @@ void DrawTrainDetails(const Train *v, const Rect &r, int vscroll_pos, uint16_t v
if (det_tab != TDW_TAB_TOTALS) {
Direction dir = rtl ? DIR_E : DIR_W;
int x = rtl ? r.right : r.left;
byte line_number = 0;
uint8_t line_number = 0;
for (; v != nullptr && vscroll_pos > -vscroll_cap; v = v->GetNextVehicle()) {
GetCargoSummaryOfArticulatedVehicle(v, _cargo_summary);