(svn r19223) [1.0] -Backport from trunk:

- Feature: Add OpenMSX to the installer (r19220, r19219)
- Feature: [NewGRF] Add CB36 support for aircraft properties 0F and 11 (r19218)
- Feature: Scroll to current order destination when ctrl+clicking the start/stop bar (r19216, r19215)
- Feature: Concept of fallback base sets, i.e. do not automatically load the NoMusic/NoSound sets when there is another set; make NoSound part of base installations (r19214, r19213, r19212, r19211, r19206)
- Feature: Support for genders for cargos, industries, vehicles, stations (r19180, r19179, r19178, r19177)
This commit is contained in:
rubidium
2010-02-23 23:26:37 +00:00
parent 5b188a4933
commit bfa5e7fef5
32 changed files with 472 additions and 323 deletions
+1 -17
View File
@@ -996,23 +996,7 @@ public:
int sel = this->GetOrderFromPt(pt.y);
if (_ctrl_pressed && sel < this->vehicle->GetNumOrders()) {
const Order *ord = this->vehicle->GetOrder(sel);
TileIndex xy = INVALID_TILE;
switch (ord->GetType()) {
case OT_GOTO_WAYPOINT:
case OT_GOTO_STATION:
xy = BaseStation::Get(ord->GetDestination())->xy;
break;
case OT_GOTO_DEPOT:
if ((ord->GetDepotActionType() & ODATFB_NEAREST_DEPOT) != 0) break;
xy = (this->vehicle->type == VEH_AIRCRAFT) ? Station::Get(ord->GetDestination())->xy : Depot::Get(ord->GetDestination())->xy;
break;
default:
break;
}
TileIndex xy = this->vehicle->GetOrder(sel)->GetLocation(this->vehicle);
if (xy != INVALID_TILE) ScrollMainWindowToTile(xy);
return;
}