gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-12 18:40:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r25432) -Fix [FS#5608]: clang compiler error; sometimes it's more strict than others

Browse Source
This commit is contained in:
rubidium 2013-06-22 07:44:59 +00:00
parent d0fe055ae4
commit e797f53c33
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/station_gui.cpp
View File

@ -956,6 +956,16 @@ public:
*/ */
CargoDataSet::iterator End() const { return this->children->end(); } 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(); void Clear();
private: private:
@ -1322,7 +1332,7 @@ struct StationViewWindow : public Window {
case GR_CARGO: case GR_CARGO:
assert(i == 0); assert(i == 0);
data = data->InsertOrRetrieve(cargo); data = data->InsertOrRetrieve(cargo);
data->transfers = (source != this->window_number); data->SetTransfers(source != this->window_number);
expand = expand->Retrieve(cargo); expand = expand->Retrieve(cargo);
break; break;
case GR_SOURCE: case GR_SOURCE:
@ -1759,7 +1769,7 @@ struct StationViewWindow : public Window {
} else { } else {
/* Only draw '+' if there is something to be shown. */ /* Only draw '+' if there is something to be shown. */
const StationCargoList &list = Station::Get(this->window_number)->goods[cargo].cargo; 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 = "+"; sym = "+";
} }
} }