petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r6562) -Codechange: merged the vehicle list window widget arrays

Browse Source 
It made no sense to maintain 8 nearly identically arrays when a single one can do the job
  Also made the two buttons always use half of the bottom width each, even when resizing
This commit is contained in:
bjarni
2006-09-28 23:05:03 +00:00
parent 1ae8aa4b80
commit 4ccdb0686f
13 changed files with 275 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main_gui.c
View File

@@ -33,6 +33,7 @@
#include "genworld.h"
#include "settings.h"
#include "date.h"
#include "vehicle_gui.h"
#include "network_data.h"
#include "network_client.h"
@@ -268,22 +269,22 @@ static void MenuClickIndustry(int index)
static void MenuClickShowTrains(int index)
{
ShowPlayerTrains(index, INVALID_STATION);
ShowVehicleListWindow(index, INVALID_STATION, VEH_Train);
}
static void MenuClickShowRoad(int index)
{
ShowPlayerRoadVehicles(index, INVALID_STATION);
ShowVehicleListWindow(index, INVALID_STATION, VEH_Road);
}
static void MenuClickShowShips(int index)
{
ShowPlayerShips(index, INVALID_STATION);
ShowVehicleListWindow(index, INVALID_STATION, VEH_Ship);
}
static void MenuClickShowAir(int index)
{
ShowPlayerAircraft(index, INVALID_STATION);
ShowVehicleListWindow(index, INVALID_STATION, VEH_Aircraft);
}
static void MenuClickBuildRail(int index)
@@ -1792,10 +1793,10 @@ static void MainToolbarWndProc(Window *w, WindowEvent *e)
case WKC_F10:ShowOperatingProfitGraph(); break;
case WKC_F11: ShowCompanyLeagueTable(); break;
case WKC_F12: ShowBuildIndustryWindow(); break;
case WKC_SHIFT | WKC_F1: ShowPlayerTrains(local, INVALID_STATION); break;
case WKC_SHIFT | WKC_F2: ShowPlayerRoadVehicles(local, INVALID_STATION); break;
case WKC_SHIFT | WKC_F3: ShowPlayerShips(local, INVALID_STATION); break;
case WKC_SHIFT | WKC_F4: ShowPlayerAircraft(local, INVALID_STATION); 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_F5: ToolbarZoomInClick(w); break;
case WKC_SHIFT | WKC_F6: ToolbarZoomOutClick(w); break;
case WKC_SHIFT | WKC_F7: ShowBuildRailToolbar(_last_built_railtype,-1); break;