diff options
| author | rubidium <rubidium@openttd.org> | 2010-06-19 16:40:31 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-06-19 16:40:31 +0000 |
| commit | 3e35018f97a29007f865a589452872df1a909d90 (patch) | |
| tree | c492773a4def4fbf693ad78fff8be109da4e145f /src | |
| parent | 99a11badaf80f6f3a7ddaec74ca7fad712b28957 (diff) | |
| download | openttd-3e35018f97a29007f865a589452872df1a909d90.tar.xz | |
(svn r19997) -Codechange: Unify order of ship and plane icon in stationlist and stationsigns with the rest of the game (frosch)
Diffstat (limited to 'src')
| -rw-r--r-- | src/station_gui.cpp | 3 | ||||
| -rw-r--r-- | src/strings.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index e67f4f26d..9f8480e10 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -181,6 +181,7 @@ enum StationListWidgets { SLW_LIST, ///< The main panel, list of stations SLW_SCROLLBAR, ///< Scrollbar next to the main panel + /* Vehicletypes need to be in order of StationFacility due to bit magic */ SLW_TRAIN, ///< 'TRAIN' button - list only facilities where is a railroad station SLW_TRUCK, ///< 'TRUCK' button - list only facilities where is a truck stop SLW_BUS, ///< 'BUS' button - list only facilities where is a bus stop @@ -765,8 +766,8 @@ static const NWidgetPart _nested_company_stations_widgets[] = { NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRAIN), SetMinimalSize(14, 11), SetDataTip(STR_TRAIN, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_TRUCK), SetMinimalSize(14, 11), SetDataTip(STR_LORRY, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_BUS), SetMinimalSize(14, 11), SetDataTip(STR_BUS, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), - NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_AIRPLANE), SetMinimalSize(14, 11), SetDataTip(STR_PLANE, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_SHIP), SetMinimalSize(14, 11), SetDataTip(STR_SHIP, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), + NWidget(WWT_TEXTBTN, COLOUR_GREY, SLW_AIRPLANE), SetMinimalSize(14, 11), SetDataTip(STR_PLANE, STR_STATION_LIST_USE_CTRL_TO_SELECT_MORE), SetFill(0, 1), NWidget(WWT_PUSHBTN, COLOUR_GREY, SLW_FACILALL), SetMinimalSize(14, 11), SetDataTip(0x0, STR_STATION_LIST_SELECT_ALL_FACILITIES), SetFill(0, 1), NWidget(WWT_PANEL, COLOUR_GREY), SetMinimalSize(5, 11), SetFill(0, 1), EndContainer(), NWidgetFunction(CargoWidgets), diff --git a/src/strings.cpp b/src/strings.cpp index b25014e5a..fbd1daf0f 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1118,8 +1118,8 @@ static char *StationGetSpecialString(char *buff, int x, const char *last) if ((x & FACIL_TRAIN) && (buff + Utf8CharLen(SCC_TRAIN) < last)) buff += Utf8Encode(buff, SCC_TRAIN); if ((x & FACIL_TRUCK_STOP) && (buff + Utf8CharLen(SCC_LORRY) < last)) buff += Utf8Encode(buff, SCC_LORRY); if ((x & FACIL_BUS_STOP) && (buff + Utf8CharLen(SCC_BUS) < last)) buff += Utf8Encode(buff, SCC_BUS); - if ((x & FACIL_AIRPORT) && (buff + Utf8CharLen(SCC_PLANE) < last)) buff += Utf8Encode(buff, SCC_PLANE); if ((x & FACIL_DOCK) && (buff + Utf8CharLen(SCC_SHIP) < last)) buff += Utf8Encode(buff, SCC_SHIP); + if ((x & FACIL_AIRPORT) && (buff + Utf8CharLen(SCC_PLANE) < last)) buff += Utf8Encode(buff, SCC_PLANE); *buff = '\0'; return buff; } |