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

Sending a vehicle to a depot for sale can now sell immediately

Browse Source 
If the vehicle is already stopped in a suitable depot
This commit is contained in:
Jonathan G Rennison
2022-06-25 20:33:21 +01:00
parent 85e949a6ba
commit 5059054f0a
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/vehicle.cpp
View File

@@ -3614,7 +3614,29 @@ CommandCost Vehicle::SendToDepot(DoCommandFlag flags, DepotCommand command, Tile
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
if (this->vehstatus & VS_CRASHED) return CMD_ERROR; if (this->vehstatus & VS_CRASHED) return CMD_ERROR;
if (this->IsStoppedInDepot()) return CMD_ERROR; if (this->IsStoppedInDepot()) {
if ((command & DEPOT_SELL) && !(command & DEPOT_CANCEL) && (!(command & DEPOT_SPECIFIC) || specific_depot == this->tile)) {
/* Sell vehicle immediately */
if (flags & DC_EXEC) {
int x = this->x_pos;
int y = this->y_pos;
int z = this->z_pos;
CommandCost cost = DoCommand(this->tile, this->index | (1 << 20), 0, flags, CMD_SELL_VEHICLE);
if (cost.Succeeded()) {
if (IsLocalCompany()) {
if (cost.GetCost() != 0) {
ShowCostOrIncomeAnimation(x, y, z, cost.GetCost());
}
}
SubtractMoneyFromCompany(cost);
}
}
return CommandCost();
}
return CMD_ERROR;
}
auto cancel_order = [&]() { auto cancel_order = [&]() {
if (flags & DC_EXEC) { if (flags & DC_EXEC) {