Mercurial > hg > openttd
diff src/train_cmd.cpp @ 9628:f1d95c5d5553 draft
(svn r13691) -Codechange: make it easier to determine whether a command is ran in the context of autoreplace or not
| author | smatz <smatz@openttd.org> |
|---|---|
| date | Wed, 09 Jul 2008 20:55:47 +0000 (2008-07-09) |
| parents | bcc765d85155 |
| children | 128a1a7ade68 |
line wrap: on
line diff
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -685,8 +685,7 @@ * @param tile tile of the depot where rail-vehicle is built * @param flags type of operation * @param p1 engine type id - * @param p2 bit 0 when set, the train will get number 0, otherwise it will get a free number - * bit 1 prevents any free cars from being added to the train + * @param p2 bit 1 prevents any free cars from being added to the train */ CommandCost CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) { @@ -725,7 +724,7 @@ Vehicle *v = vl[0]; - UnitID unit_num = HasBit(p2, 0) ? 0 : GetFreeUnitNumber(VEH_TRAIN); + UnitID unit_num = (flags & DC_AUTOREPLACE) ? 0 : GetFreeUnitNumber(VEH_TRAIN); if (unit_num > _settings_game.vehicle.max_trains) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); @@ -798,7 +797,7 @@ TrainConsistChanged(v); UpdateTrainGroupID(v); - if (!HasBit(p2, 1)) { // check if the cars should be added to the new vehicle + if (!HasBit(p2, 1) && !(flags & DC_AUTOREPLACE)) { // check if the cars should be added to the new vehicle NormalizeTrainVehInDepot(v); }