diff options
| author | Darkvater <darkvater@openttd.org> | 2006-10-31 21:15:56 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-10-31 21:15:56 +0000 |
| commit | eadf788cc5d068622f20221566f4027625090689 (patch) | |
| tree | f1aae895580a4a2bc7864f645fae39e9c2bc7669 /main_gui.c | |
| parent | 993cb13c8dde55d77b732bba55bf3c94b0ea9216 (diff) | |
| download | openttd-eadf788cc5d068622f20221566f4027625090689.tar.xz | |
(svn r7022) -Fix [FS#292]: Properly guard against viewing company-sensitive information from
invalid players (eg spectators) which could lead to crashes.
Diffstat (limited to 'main_gui.c')
| -rw-r--r-- | main_gui.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/main_gui.c b/main_gui.c index bb354e16b..bfaed7ad1 100644 --- a/main_gui.c +++ b/main_gui.c @@ -1821,30 +1821,26 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e) } break; case WE_KEYPRESS: { - PlayerID local = (_local_player != PLAYER_SPECTATOR) ? _local_player : 0; - switch (e->we.keypress.keycode) { - case WKC_F1: case WKC_PAUSE: - ToolbarPauseClick(w); - break; + case WKC_F1: case WKC_PAUSE: ToolbarPauseClick(w); break; case WKC_F2: ShowGameOptions(); break; case WKC_F3: MenuClickSaveLoad(0); break; case WKC_F4: ShowSmallMap(); break; case WKC_F5: ShowTownDirectory(); break; case WKC_F6: ShowSubsidiesList(); break; - case WKC_F7: ShowPlayerStations(local); break; - case WKC_F8: ShowPlayerFinances(local); break; - case WKC_F9: ShowPlayerCompany(local); break; + case WKC_F7: ShowPlayerStations(_local_player); break; + case WKC_F8: ShowPlayerFinances(_local_player); break; + case WKC_F9: ShowPlayerCompany(_local_player); break; case WKC_F10:ShowOperatingProfitGraph(); break; case WKC_F11: ShowCompanyLeagueTable(); break; case WKC_F12: ShowBuildIndustryWindow(); break; - case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(local, INVALID_STATION, VEH_Train); break; - case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(local, INVALID_STATION, VEH_Road); break; - case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(local, INVALID_STATION, VEH_Ship); break; - case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(local, INVALID_STATION, VEH_Aircraft); break; + case WKC_SHIFT | WKC_F1: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Train); break; + case WKC_SHIFT | WKC_F2: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Road); break; + case WKC_SHIFT | WKC_F3: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Ship); break; + case WKC_SHIFT | WKC_F4: ShowVehicleListWindow(_local_player, INVALID_STATION, VEH_Aircraft); break; case WKC_SHIFT | WKC_F5: ToolbarZoomInClick(w); break; case WKC_SHIFT | WKC_F6: ToolbarZoomOutClick(w); break; - case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype,-1); break; + case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype, -1); break; case WKC_SHIFT | WKC_F8: ShowBuildRoadToolbar(); break; case WKC_SHIFT | WKC_F9: ShowBuildDocksToolbar(); break; case WKC_SHIFT | WKC_F10:ShowBuildAirToolbar(); break; |