Mercurial > hg > openttd
changeset 20472:f0af7c48dc25 draft
(svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others
author | rubidium <rubidium@openttd.org> |
---|---|
date | Sat, 22 Jun 2013 07:44:59 +0000 |
parents | 21410954e588 |
children | 6a3678426dd1 |
files | src/station_gui.cpp |
diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -956,6 +956,16 @@ */ CargoDataSet::iterator End() const { return this->children->end(); } + /** + * Has this entry transfers. + */ + bool HasTransfers() const { return this->transfers; } + + /** + * Set the transfers state. + */ + void SetTransfers(bool value) { this->transfers = value; } + void Clear(); private: @@ -1322,7 +1332,7 @@ case GR_CARGO: assert(i == 0); data = data->InsertOrRetrieve(cargo); - data->transfers = (source != this->window_number); + data->SetTransfers(source != this->window_number); expand = expand->Retrieve(cargo); break; case GR_SOURCE: @@ -1759,7 +1769,7 @@ } else { /* Only draw '+' if there is something to be shown. */ const StationCargoList &list = Station::Get(this->window_number)->goods[cargo].cargo; - if (grouping == GR_CARGO && (list.ReservedCount() > 0 || cd->transfers)) { + if (grouping == GR_CARGO && (list.ReservedCount() > 0 || cd->HasTransfers())) { sym = "+"; } }