diff options
Diffstat (limited to 'src/group_cmd.cpp')
| -rw-r--r-- | src/group_cmd.cpp | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/src/group_cmd.cpp b/src/group_cmd.cpp index 029ea1e92..a3587abbf 100644 --- a/src/group_cmd.cpp +++ b/src/group_cmd.cpp @@ -387,6 +387,32 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 /** + * Do add a vehicle to a group. + * @param v Vehicle to add. + * @param new_g Group to add to. + */ +static void AddVehicleToGroup(Vehicle *v, GroupID new_g) +{ + GroupStatistics::CountVehicle(v, -1); + + switch (v->type) { + default: NOT_REACHED(); + case VEH_TRAIN: + SetTrainGroupID(Train::From(v), new_g); + break; + + case VEH_ROAD: + case VEH_SHIP: + case VEH_AIRCRAFT: + if (v->IsEngineCountable()) UpdateNumEngineGroup(v, v->group_id, new_g); + v->group_id = new_g; + break; + } + + GroupStatistics::CountVehicle(v, 1); +} + +/** * Add a vehicle to a group * @param tile unused * @param flags type of operation @@ -394,12 +420,13 @@ CommandCost CmdRenameGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 * - p1 bit 0-15 : GroupID * @param p2 vehicle to add to a group * - p2 bit 0-19 : VehicleID + * - p2 bit 31 : Add shared vehicles as well. * @param text unused * @return the cost of this operation or an error */ CommandCost CmdAddVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { - Vehicle *v = Vehicle::GetIfValid(p2); + Vehicle *v = Vehicle::GetIfValid(GB(p2, 0, 20)); GroupID new_g = p1; if (v == NULL || (!Group::IsValidID(new_g) && !IsDefaultGroupID(new_g))) return CMD_ERROR; @@ -412,22 +439,15 @@ CommandCost CmdAddVehicleGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, u if (v->owner != _current_company || !v->IsPrimaryVehicle()) return CMD_ERROR; if (flags & DC_EXEC) { - GroupStatistics::CountVehicle(v, -1); - - switch (v->type) { - default: NOT_REACHED(); - case VEH_TRAIN: - SetTrainGroupID(Train::From(v), new_g); - break; - case VEH_ROAD: - case VEH_SHIP: - case VEH_AIRCRAFT: - if (v->IsEngineCountable()) UpdateNumEngineGroup(v, v->group_id, new_g); - v->group_id = new_g; - break; + AddVehicleToGroup(v, new_g); + + if (HasBit(p2, 31)) { + /* Add vehicles in the shared order list as well. */ + for (Vehicle *v2 = v->FirstShared(); v2 != NULL; v2 = v2->NextShared()) { + if (v2->group_id != new_g) AddVehicleToGroup(v2, new_g); + } } - GroupStatistics::CountVehicle(v, 1); GroupStatistics::UpdateAutoreplace(v->owner); /* Update the Replace Vehicle Windows */ |