mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17650) -Codechange: Checking a condition once is enough.

release/1.0
alberth 2009-09-26 19:26:08 +00:00
parent f7120de1f7
commit dd108f2399
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/depot_gui.cpp
View File

@ -870,31 +870,28 @@ struct DepotWindow : Window {
} }
} break; } break;
case DEPOT_WIDGET_SELL: case DEPOT_WIDGET_SELL_CHAIN: case DEPOT_WIDGET_SELL: case DEPOT_WIDGET_SELL_CHAIN: {
if (!this->IsWidgetDisabled(DEPOT_WIDGET_SELL) && if (this->IsWidgetDisabled(widget)) return;
this->sel != INVALID_VEHICLE) { if (this->sel == INVALID_VEHICLE) return;
if (this->IsWidgetDisabled(widget)) return; this->HandleButtonClick(widget);
if (this->sel == INVALID_VEHICLE) return;
this->HandleButtonClick(widget); const Vehicle *v = Vehicle::Get(this->sel);
this->sel = INVALID_VEHICLE;
this->SetDirty();
const Vehicle *v = Vehicle::Get(this->sel); int sell_cmd = (v->type == VEH_TRAIN && (widget == DEPOT_WIDGET_SELL_CHAIN || _ctrl_pressed)) ? 1 : 0;
this->sel = INVALID_VEHICLE;
this->SetDirty();
int sell_cmd = (v->type == VEH_TRAIN && (widget == DEPOT_WIDGET_SELL_CHAIN || _ctrl_pressed)) ? 1 : 0; bool is_engine = (v->type != VEH_TRAIN || Train::From(v)->IsFrontEngine());
bool is_engine = (v->type != VEH_TRAIN || Train::From(v)->IsFrontEngine()); if (is_engine) {
_backup_orders_tile = v->tile;
if (is_engine) { BackupVehicleOrders(v);
_backup_orders_tile = v->tile;
BackupVehicleOrders(v);
}
if (!DoCommandP(v->tile, v->index, sell_cmd, GetCmdSellVeh(v->type)) && is_engine) _backup_orders_tile = 0;
} }
break;
if (!DoCommandP(v->tile, v->index, sell_cmd, GetCmdSellVeh(v->type)) && is_engine) _backup_orders_tile = 0;
} break;
default: default:
this->sel = INVALID_VEHICLE; this->sel = INVALID_VEHICLE;
this->SetDirty(); this->SetDirty();