Changeset - r13135:dda42f2815eb
[Not reviewed]
master
0 1 0
alberth - 15 years ago 2009-09-26 19:26:08
alberth@openttd.org
(svn r17650) -Codechange: Checking a condition once is enough.
1 file changed with 16 insertions and 19 deletions:
0 comments (0 inline, 0 general)
src/depot_gui.cpp
Show inline comments
 
@@ -870,31 +870,28 @@ struct DepotWindow : Window {
 
				}
 
			} break;
 

	
 
			case DEPOT_WIDGET_SELL: case DEPOT_WIDGET_SELL_CHAIN:
 
				if (!this->IsWidgetDisabled(DEPOT_WIDGET_SELL) &&
 
					this->sel != INVALID_VEHICLE) {
 
			case DEPOT_WIDGET_SELL: case DEPOT_WIDGET_SELL_CHAIN: {
 
				if (this->IsWidgetDisabled(widget)) return;
 
				if (this->sel == INVALID_VEHICLE) return;
 

	
 
					if (this->IsWidgetDisabled(widget)) return;
 
					if (this->sel == INVALID_VEHICLE) return;
 
				this->HandleButtonClick(widget);
 

	
 
					this->HandleButtonClick(widget);
 

	
 
					const Vehicle *v = Vehicle::Get(this->sel);
 
					this->sel = INVALID_VEHICLE;
 
					this->SetDirty();
 
				const Vehicle *v = Vehicle::Get(this->sel);
 
				this->sel = INVALID_VEHICLE;
 
				this->SetDirty();
 

	
 
					int sell_cmd = (v->type == VEH_TRAIN && (widget == DEPOT_WIDGET_SELL_CHAIN || _ctrl_pressed)) ? 1 : 0;
 
				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;
 
						BackupVehicleOrders(v);
 
					}
 
				if (is_engine) {
 
					_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:
 
				this->sel = INVALID_VEHICLE;
 
				this->SetDirty();
0 comments (0 inline, 0 general)