diff options
| author | rubidium <rubidium@openttd.org> | 2009-02-04 16:45:07 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-02-04 16:45:07 +0000 |
| commit | 7da743a0dc8d9e5098da2464d405a0ed93803c17 (patch) | |
| tree | 4a5fe41066de010bd441a15fc54033301d5a6f07 /src/toolbar_gui.cpp | |
| parent | 09fca459a7acd7c1b1e14712678a977d30a13297 (diff) | |
| download | openttd-7da743a0dc8d9e5098da2464d405a0ed93803c17.tar.xz | |
(svn r15336) -Fix: do not use _current_company in the GUI as there are no guarantees that _current_company is the same as _local_company.
Diffstat (limited to 'src/toolbar_gui.cpp')
| -rw-r--r-- | src/toolbar_gui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index 29d5c62e6..ab70c9f6d 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -529,7 +529,7 @@ static void MenuClickLeague(int index) static void ToolbarIndustryClick(Window *w) { /* Disable build-industry menu if we are a spectator */ - PopupMainToolbMenu(w, TBN_INDUSTRIES, STR_INDUSTRY_DIR, (_current_company == COMPANY_SPECTATOR) ? 1 : 2); + PopupMainToolbMenu(w, TBN_INDUSTRIES, STR_INDUSTRY_DIR, (_local_company == COMPANY_SPECTATOR) ? 1 : 2); } static void MenuClickIndustry(int index) @@ -1035,7 +1035,7 @@ struct MainToolbarWindow : Window { /* If spectator, disable all construction buttons * ie : Build road, rail, ships, airports and landscaping * Since enabled state is the default, just disable when needed */ - this->SetWidgetsDisabledState(_current_company == COMPANY_SPECTATOR, TBN_RAILS, TBN_ROADS, TBN_WATER, TBN_AIR, TBN_LANDSCAPE, WIDGET_LIST_END); + this->SetWidgetsDisabledState(_local_company == COMPANY_SPECTATOR, TBN_RAILS, TBN_ROADS, TBN_WATER, TBN_AIR, TBN_LANDSCAPE, WIDGET_LIST_END); /* disable company list drop downs, if there are no companies */ this->SetWidgetsDisabledState(ActiveCompanyCount() == TBN_PAUSE, TBN_STATIONS, TBN_FINANCES, TBN_TRAINS, TBN_ROADVEHS, TBN_SHIPS, TBN_AIRCRAFTS, WIDGET_LIST_END); |