diff options
| author | frosch <frosch@openttd.org> | 2016-11-05 19:16:59 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2016-11-05 19:16:59 +0000 |
| commit | 476b2b0e8ca97807c2ffa0bb56ca7afcb5371a3b (patch) | |
| tree | 5e30db10c875d4b9e7979618ff76f1a24bff0a3e /src/vehicle_cmd.cpp | |
| parent | d9bfe88261b99631322ca348e48027e22fa3c84e (diff) | |
| download | openttd-476b2b0e8ca97807c2ffa0bb56ca7afcb5371a3b.tar.xz | |
(svn r27677) -Codechange: Remove implicit VehicleListIdentifier from uint32 constructor, to make conversions more explicit.
Diffstat (limited to 'src/vehicle_cmd.cpp')
| -rw-r--r-- | src/vehicle_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index 3b664defb..9670fa05d 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -606,7 +606,7 @@ CommandCost CmdMassStartStopVehicle(TileIndex tile, DoCommandFlag flags, uint32 bool vehicle_list_window = HasBit(p1, 1); VehicleListIdentifier vli; - if (!vli.Unpack(p2)) return CMD_ERROR; + if (!vli.UnpackIfValid(p2)) return CMD_ERROR; if (!IsCompanyBuildableVehicleType(vli.vtype)) return CMD_ERROR; if (vehicle_list_window) { @@ -1001,7 +1001,7 @@ CommandCost CmdSendVehicleToDepot(TileIndex tile, DoCommandFlag flags, uint32 p1 if (p1 & DEPOT_MASS_SEND) { /* Mass goto depot requested */ VehicleListIdentifier vli; - if (!vli.Unpack(p2)) return CMD_ERROR; + if (!vli.UnpackIfValid(p2)) return CMD_ERROR; return SendAllVehiclesToDepot(flags, (p1 & DEPOT_SERVICE) != 0, vli); } |