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

Fix static asserts in OrderDestinationRefcountMapKey

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-05-22 19:27:06 +01:00
parent bfff4571a2
commit b8820ded59
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/order_base.h
View File

@@ -35,8 +35,8 @@ extern bool _order_destination_refcount_map_valid;
inline uint32 OrderDestinationRefcountMapKey(DestinationID dest, CompanyID cid, OrderType order_type, VehicleType veh_type) inline uint32 OrderDestinationRefcountMapKey(DestinationID dest, CompanyID cid, OrderType order_type, VehicleType veh_type)
{ {
static_assert(sizeof(dest) == 2); assert_compile(sizeof(dest) == 2);
static_assert(OT_END <= 16); assert_compile(OT_END <= 16);
return (((uint32) dest) << 16) | (((uint32) cid) << 8) | (((uint32) order_type) << 4) | ((uint32) veh_type); return (((uint32) dest) << 16) | (((uint32) cid) << 8) | (((uint32) order_type) << 4) | ((uint32) veh_type);
} }