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

Adding of _t to (u)int types, and WChar to char32_t

Browse Source 
See: eaae0bb5e
This commit is contained in:
Jonathan G Rennison
2024-01-07 16:41:53 +00:00
parent 55d78a23be
commit 97e6f3062e
655 changed files with 7555 additions and 7555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/vehicle_func.h
View File

@@ -38,7 +38,7 @@ struct Viewport;
* @return True iff the image index is valid.
*/
template <VehicleType T>
bool IsValidImageIndex(uint8 image_index);
bool IsValidImageIndex(uint8_t image_index);
typedef Vehicle *VehicleFromPosProc(Vehicle *v, void *data);
@@ -118,8 +118,8 @@ inline bool HasVehicleOnPosXY(int x, int y, VehicleType type, void *data, Vehicl
}
void CallVehicleTicks();
uint8 CalcPercentVehicleFilled(const Vehicle *v, StringID *colour);
uint8 CalcPercentVehicleFilledOfCargo(const Vehicle *v, CargoID cargo);
uint8_t CalcPercentVehicleFilled(const Vehicle *v, StringID *colour);
uint8_t CalcPercentVehicleFilledOfCargo(const Vehicle *v, CargoID cargo);
void VehicleLengthChanged(const Vehicle *u);
@@ -199,48 +199,48 @@ SpriteID GetEnginePalette(EngineID engine_type, CompanyID company);
SpriteID GetVehiclePalette(const Vehicle *v);
SpriteID GetUncachedTrainPaletteIgnoringGroup(const Train *v);
extern const uint32 _veh_build_proc_table[];
extern const uint32 _veh_sell_proc_table[];
extern const uint32 _veh_refit_proc_table[];
extern const uint32 _send_to_depot_proc_table[];
extern const uint32_t _veh_build_proc_table[];
extern const uint32_t _veh_sell_proc_table[];
extern const uint32_t _veh_refit_proc_table[];
extern const uint32_t _send_to_depot_proc_table[];
/* Functions to find the right command for certain vehicle type */
inline uint32 GetCmdBuildVeh(VehicleType type)
inline uint32_t GetCmdBuildVeh(VehicleType type)
{
return _veh_build_proc_table[type];
}
inline uint32 GetCmdBuildVeh(const BaseVehicle *v)
inline uint32_t GetCmdBuildVeh(const BaseVehicle *v)
{
return GetCmdBuildVeh(v->type);
}
inline uint32 GetCmdSellVeh(VehicleType type)
inline uint32_t GetCmdSellVeh(VehicleType type)
{
return _veh_sell_proc_table[type];
}
inline uint32 GetCmdSellVeh(const BaseVehicle *v)
inline uint32_t GetCmdSellVeh(const BaseVehicle *v)
{
return GetCmdSellVeh(v->type);
}
inline uint32 GetCmdRefitVeh(VehicleType type)
inline uint32_t GetCmdRefitVeh(VehicleType type)
{
return _veh_refit_proc_table[type];
}
inline uint32 GetCmdRefitVeh(const BaseVehicle *v)
inline uint32_t GetCmdRefitVeh(const BaseVehicle *v)
{
return GetCmdRefitVeh(v->type);
}
inline uint32 GetCmdSendToDepot(VehicleType type)
inline uint32_t GetCmdSendToDepot(VehicleType type)
{
return _send_to_depot_proc_table[type];
}
inline uint32 GetCmdSendToDepot(const BaseVehicle *v)
inline uint32_t GetCmdSendToDepot(const BaseVehicle *v)
{
return GetCmdSendToDepot(v->type);
}
@@ -251,7 +251,7 @@ CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits);
extern VehicleID _new_vehicle_id;
extern uint _returned_refit_capacity;
extern uint16 _returned_mail_refit_capacity;
extern uint16_t _returned_mail_refit_capacity;
extern CargoArray _returned_vehicle_capacities;
bool CanVehicleUseStation(EngineID engine_type, const struct Station *st);
@@ -261,7 +261,7 @@ StringID GetVehicleCannotUseStationReason(const Vehicle *v, const Station *st);
void ReleaseDisastersTargetingVehicle(VehicleID vehicle);
typedef std::vector<VehicleID> VehicleSet;
void GetVehicleSet(VehicleSet &set, Vehicle *v, uint8 num_vehicles);
void GetVehicleSet(VehicleSet &set, Vehicle *v, uint8_t num_vehicles);
void CheckCargoCapacity(Vehicle *v);