From ea4b40704b351de69cff4a6beaa4cf526f18bb9b Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 8 Sep 2010 21:02:12 +0000 Subject: (svn r20769) -Codechange: move some depot flags from p2 to p1 in CmdSendVehicleToDepot --- src/vehicle_type.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/vehicle_type.h') diff --git a/src/vehicle_type.h b/src/vehicle_type.h index dc283de16..57f55a2b7 100644 --- a/src/vehicle_type.h +++ b/src/vehicle_type.h @@ -54,14 +54,13 @@ enum VehiclePathFinders { VPF_YAPF = 2, ///< Yet Another PathFinder }; -/* Flags to add to p2 for goto depot commands - * Note: bits 8-10 are used for VLW flags */ +/** Flags to add to p1 for goto depot commands. */ enum DepotCommand { - DEPOT_SERVICE = (1 << 0), ///< The vehicle will leave the depot right after arrival (serivce only) - DEPOT_MASS_SEND = (1 << 1), ///< Tells that it's a mass send to depot command (type in VLW flag) - DEPOT_DONT_CANCEL = (1 << 2), ///< Don't cancel current goto depot command if any - DEPOT_LOCATE_HANGAR = (1 << 3), ///< Find another airport if the target one lacks a hangar - DEPOT_COMMAND_MASK = 0xF, + DEPOT_SERVICE = (1U << 28), ///< The vehicle will leave the depot right after arrival (serivce only) + DEPOT_MASS_SEND = (1U << 29), ///< Tells that it's a mass send to depot command (type in VLW flag) + DEPOT_DONT_CANCEL = (1U << 30), ///< Don't cancel current goto depot command if any + DEPOT_LOCATE_HANGAR = (1U << 31), ///< Find another airport if the target one lacks a hangar + DEPOT_COMMAND_MASK = 0xFU << 28, }; static const uint MAX_LENGTH_VEHICLE_NAME_BYTES = 31; ///< The maximum length of a vehicle name in bytes including '\0' -- cgit v1.2.3-54-g00ecf