diff options
| author | planetmaker <planetmaker@openttd.org> | 2010-11-06 20:11:36 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2010-11-06 20:11:36 +0000 |
| commit | eaae7ab8b1ff592fb78b54e58ccdd0a82ffc7559 (patch) | |
| tree | cf80f283889c3b1a27276fa2a302ff806e253057 | |
| parent | 59d32eff47942df97c86428b973e884fafa230fe (diff) | |
| download | openttd-eaae7ab8b1ff592fb78b54e58ccdd0a82ffc7559.tar.xz | |
(svn r21103) -Change: Use the same sorting of the sorting criteria for both trains and road vehicles
| -rw-r--r-- | src/build_vehicle_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp index d5bbdf460..e12df60df 100644 --- a/src/build_vehicle_gui.cpp +++ b/src/build_vehicle_gui.cpp @@ -314,13 +314,13 @@ static EngList_SortTypeFunction * const _sorter[][10] = {{ &EngineNumberSorter, &EngineCostSorter, &EngineSpeedSorter, + &EnginePowerSorter, &EngineIntroDateSorter, &EngineNameSorter, &EngineRunningCostSorter, + &EnginePowerVsRunningCostSorter, &EngineReliabilitySorter, &RoadVehEngineCapacitySorter, - &EnginePowerSorter, - &EnginePowerVsRunningCostSorter, }, { /* Ships */ &EngineNumberSorter, @@ -361,13 +361,13 @@ static const StringID _sort_listing[][11] = {{ STR_SORT_BY_ENGINE_ID, STR_SORT_BY_COST, STR_SORT_BY_MAX_SPEED, + STR_SORT_BY_POWER, STR_SORT_BY_INTRO_DATE, STR_SORT_BY_NAME, STR_SORT_BY_RUNNING_COST, + STR_SORT_BY_POWER_VS_RUNNING_COST, STR_SORT_BY_RELIABILITY, STR_SORT_BY_CARGO_CAPACITY, - STR_SORT_BY_POWER, - STR_SORT_BY_POWER_VS_RUNNING_COST, INVALID_STRING_ID }, { /* Ships */ @@ -1071,8 +1071,8 @@ struct BuildVehicleWindow : Window { /* Disable sorting by power when the original acceleration model for road vehicles is being used. */ if (this->vehicle_type == VEH_ROAD && _settings_game.vehicle.roadveh_acceleration_model == AM_ORIGINAL) { - SetBit(hidden_mask, 8); - SetBit(hidden_mask, 9); + SetBit(hidden_mask, 3); + SetBit(hidden_mask, 7); } ShowDropDownMenu(this, _sort_listing[this->vehicle_type], this->sort_criteria, BUILD_VEHICLE_WIDGET_SORT_DROPDOWN, 0, hidden_mask); break; |