cpp/openttd-patchpack/source Changeset - r606:8ecd7d248197

Changeset - r606:8ecd7d248197

Parent rev.

Child rev.

[Not reviewed]

master

0 11 0

dominik - 20 years ago 2004-12-12 17:42:04
dominik@openttd.org

(svn r1030) Some toolbar icons are arranged differently:
- Landscaping buttons have to be accessed from the landscaping toolbar
- Landscaping toolbar can be opened from all other toolbars
- The order of buttons in the docks toolbar now matches the other toolbars
- Landscaping toolbar has new keyboard shortcuts

11 files changed with 205 insertions and 251 deletions:

airport_gui.c

dock_gui.c

lang/american.txt

lang/english.txt

main_gui.c

misc_gui.c

rail_gui.c

103

road_gui.c

table/sprites.h

terraform_gui.c

ttd.h

0 comments (0 inline, 0 general)

airport_gui.c

➞

Show inline comments

@@ @@ -36,46 +36,34 @@ static void PlaceAir_DemolishArea(uint t @@
 static void BuildAirClick_Airport(Window *w)
+{
 	if (HandlePlacePushButton(w, 2, 0xAA4, 1, PlaceAirport)) ShowBuildAirportPicker();
+}
 static void BuildAirClick_Demolish(Window *w)
+{
 	HandlePlacePushButton(w, 3, ANIMCURSOR_DEMOLISH, 1, PlaceAir_DemolishArea);
+}
 static void BuildAirClick_Lower(Window *w)
+{
 	HandlePlacePushButton(w, 4, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+}
 static void BuildAirClick_Raise(Window *w)
 static void BuildAirClick_Landscaping(Window *w)
+{
 	HandlePlacePushButton(w, 5, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
+}
 static void BuildAirClick_Purchase(Window *w)
+{
 	HandlePlacePushButton(w, 6, 0x12B8, 1, PlaceProc_BuyLand);
 	ShowTerraformToolbar();
+}
 typedef void OnButtonClick(Window *w);
 static OnButtonClick * const _build_air_button_proc[] = {
 	BuildAirClick_Airport,
 	BuildAirClick_Demolish,
 	BuildAirClick_Lower,
 	BuildAirClick_Raise,
 	BuildAirClick_Purchase,
 	BuildAirClick_Landscaping,
 };
 static void BuildAirToolbWndProc(Window *w, WindowEvent *e)
+{
 	switch(e->event) {
 	case WE_PAINT:
 		DrawWindowWidgets(w);
 		break;
 	case WE_CLICK:
 		if (e->click.widget-2 >= 0)
 			_build_air_button_proc[e->click.widget - 2](w);
@@ @@ -98,37 +86,35 @@ static void BuildAirToolbWndProc(Window @@
 	case WE_ABORT_PLACE_OBJ:
 		w->click_state = 0;
 		SetWindowDirty(w);
 		w = FindWindowById(WC_BUILD_STATION, 0);
 		if (w != 0)
 			WP(w,def_d).close = true;
 		break;
+	}
+}
 static const Widget _air_toolbar_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   129,     0,    13, STR_A000_AIRPORT_CONSTRUCT,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    41,    14,    35, 0x2E8,												STR_A01E_BUILD_AIRPORT},
 {      WWT_PANEL,     7,    42,    63,    14,    35, 0x2BF,												STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    64,    85,    14,    35, 0x2B7,												STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,    86,   107,    14,    35, 0x2B6,												STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   108,   129,    14,    35, 0x12B7,											STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,    85,     0,    13, STR_A000_AIRPORTS,			STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    41,    14,    35, 0x2E8,									STR_A01E_BUILD_AIRPORT},
 {      WWT_PANEL,     7,    42,    63,    14,    35, 0x2BF,									STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    64,    85,    14,    35, SPR_IMG_LANDSCAPING_S,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _air_toolbar_desc = {
-, 22, 130, 36,
+-86, 22, 86, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_air_toolbar_widgets,
 	BuildAirToolbWndProc
 };
 void ShowBuildAirToolbar()
+{
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDescFront(&_air_toolbar_desc, 0);
+}

dock_gui.c

➞

Show inline comments

@@ @@ -50,92 +50,81 @@ static void PlaceDocks_DemolishArea(uint @@
 static void PlaceDocks_BuildCanal(uint tile)
+{
 	VpStartPlaceSizing(tile, VPM_X_OR_Y);
+}
 static void PlaceDocks_BuildLock(uint tile)
+{
 	DoCommandP(tile, 0, 0, CcBuildDocks, CMD_BUILD_LOCK | CMD_AUTO | CMD_MSG(STR_CANT_BUILD_LOCKS));
+}
-static void BuildDocksClick_Dock(Window *w)
+static void BuildDocksClick_Canal(Window *w)
+{
 	if (HandlePlacePushButton(w, 2, 0xE54, 3, PlaceDocks_Dock)) ShowBuildDockStationPicker();
 	HandlePlacePushButton(w, 2, SPR_OPENTTD_BASE + 11, 1, PlaceDocks_BuildCanal);
+}
-static void BuildDocksClick_Depot(Window *w)
+static void BuildDocksClick_Lock(Window *w)
+{
 	if (HandlePlacePushButton(w, 3, 0x2D1, 1, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
+}
 static void BuildDocksClick_Buoy(Window *w)
+{
 	HandlePlacePushButton(w, 4, 0x2BE, 1, PlaceDocks_Buoy);
 	HandlePlacePushButton(w, 3, SPR_OPENTTD_BASE + 64, 1, PlaceDocks_BuildLock);
+}
 static void BuildDocksClick_Demolish(Window *w)
+{
 	HandlePlacePushButton(w, 5, ANIMCURSOR_DEMOLISH, 1, PlaceDocks_DemolishArea);
+}
-static void BuildDocksClick_Lower(Window *w)
+static void BuildDocksClick_Depot(Window *w)
+{
 	HandlePlacePushButton(w, 6, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+}
 static void BuildDocksClick_Raise(Window *w)
+{
 	HandlePlacePushButton(w, 7, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
 	if (HandlePlacePushButton(w, 6, 0x2D1, 1, PlaceDocks_Depot)) ShowBuildDocksDepotPicker();
+}
-static void BuildDocksClick_Purchase(Window *w)
+static void BuildDocksClick_Dock(Window *w)
+{
 	HandlePlacePushButton(w, 8, 0x12B8, 1, PlaceProc_BuyLand);
 	if (HandlePlacePushButton(w, 7, 0xE54, 3, PlaceDocks_Dock)) ShowBuildDockStationPicker();
+}
-static void BuildDocksClick_Canal(Window *w)
+static void BuildDocksClick_Buoy(Window *w)
+{
-	HandlePlacePushButton(w, 9, SPR_OPENTTD_BASE + 11, 1, PlaceDocks_BuildCanal);
+	HandlePlacePushButton(w, 8, 0x2BE, 1, PlaceDocks_Buoy);
+}
-static void BuildDocksClick_Lock(Window *w)
+static void BuildDocksClick_Landscaping(Window *w)
+{
-	HandlePlacePushButton(w, 10, SPR_OPENTTD_BASE + 64, 1, PlaceDocks_BuildLock);
+	ShowTerraformToolbar();
+}
 typedef void OnButtonClick(Window *w);
 static OnButtonClick * const _build_docks_button_proc[] = {
 	BuildDocksClick_Dock,
 	BuildDocksClick_Depot,
 	BuildDocksClick_Buoy,
 	BuildDocksClick_Demolish,
 	BuildDocksClick_Lower,
 	BuildDocksClick_Raise,
 	BuildDocksClick_Purchase,
 	BuildDocksClick_Canal,
 	BuildDocksClick_Lock,
 ,
 	BuildDocksClick_Demolish,
 	BuildDocksClick_Depot,
 	BuildDocksClick_Dock,
 	BuildDocksClick_Buoy,
 	BuildDocksClick_Landscaping,
 };
 static void BuildDocksToolbWndProc(Window *w, WindowEvent *e)
+{
 	switch(e->event) {
 	case WE_PAINT:
 		DrawWindowWidgets(w);
 		break;
 	case WE_CLICK: {
 		if (e->click.widget - 2 >= 0) _build_docks_button_proc[e->click.widget - 2](w);
+		if (e->click.widget - 2 >= 0 && e->click.widget!=4) _build_docks_button_proc[e->click.widget - 2](w);
 	} break;
 	case WE_PLACE_OBJ:
 		_place_proc(e->place.tile);
 		break;
 	case WE_PLACE_DRAG: {
 		VpSelectTilesWithMethod(e->place.pt.x, e->place.pt.y, e->place.userdata);
 		return;
+	}
 	case WE_PLACE_MOUSEUP:
@@ @@ -166,39 +155,41 @@ static void BuildDocksToolbWndProc(Windo @@
 		case 3: tile_to += TILE_XY(-1,0); break;
 		case 6:	tile_to += TILE_XY(0,-1);	break;
 		case 9:	tile_to += TILE_XY(0,1);	break;
 		case 12:tile_to += TILE_XY(1,0);	break;
+		}
 		VpSetPresizeRange(tile_from, tile_to);
 	} break;
+	}
+}
 static const Widget _build_docks_toolb_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   197,     0,    13, STR_9801_DOCK_CONSTRUCTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    21,    14,    35, 746,													STR_981D_BUILD_SHIP_DOCK},
 {      WWT_PANEL,     7,    22,    43,    14,    35, 748,													STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,    44,    65,    14,    35, 693,													STR_9834_POSITION_BUOY_WHICH_CAN},
 {      WWT_PANEL,     7,    66,    87,    14,    35, 703,													STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    88,   109,    14,    35, 695,													STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   110,   131,    14,    35, 694,													STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   132,   153,    14,    35, 4791,												STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {      WWT_PANEL,     7,   154,   175,    14,    35, SPR_OPENTTD_BASE+65,					STR_BUILD_CANALS_TIP},
 {      WWT_PANEL,     7,   176,   197,    14,    35, SPR_CANALS_BASE+69,					STR_BUILD_LOCKS_TIP},
 {    WWT_CAPTION,     7,    11,   157,     0,    13, STR_9801_DOCK_CONSTRUCTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    21,    14,    35, SPR_OPENTTD_BASE+65,					STR_BUILD_CANALS_TIP},
 {      WWT_PANEL,     7,    22,    43,    14,    35, SPR_CANALS_BASE+69,					STR_BUILD_LOCKS_TIP},
 {      WWT_PANEL,     7,    44,    47,    14,    35, 0x0,													STR_NULL},
 {      WWT_PANEL,     7,    48,    69,    14,    35, 703,													STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    70,    91,    14,    35, 748,													STR_981E_BUILD_SHIP_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,    92,   113,    14,    35, 746,													STR_981D_BUILD_SHIP_DOCK},
 {      WWT_PANEL,     7,   114,   135,    14,    35, 693,													STR_9834_POSITION_BUOY_WHICH_CAN},
 {      WWT_PANEL,     7,   136,   157,    14,    35, SPR_IMG_LANDSCAPING_S,				STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_docks_toolbar_desc = {
--197, 22, 198, 36,
+-158, 22, 158, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_docks_toolb_widgets,
 	BuildDocksToolbWndProc
 };
 void ShowBuildDocksToolbar()
+{
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDesc(&_build_docks_toolbar_desc);
+}

lang/american.txt

➞

Show inline comments

@@ @@ -2564,25 +2564,25 @@ STR_983A_REFIT_CARGO_SHIP_TO_CARRY :{ @@
 STR_983B_REFIT							:{WHITE}{STRING} (Refit)
 STR_983C_REFIT_SHIP						:{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR				:{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED			:{BLACK}Refit ship to carry highlighted cargo type
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY				:{GOLD}Select cargo type to carry:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT				:{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP					:{WHITE}Can't refit ship...
 STR_9842_REFITTABLE						:(refittable)
 STR_GO_TO_SHIP_DEPOT						:Go to {TOWN} Ship Depot
 SERVICE_AT_SHIP_DEPOT						:Service at {TOWN} Ship Depot
 ##id 0xA000
-STR_A000_AIRPORT_CONSTRUCT					:{WHITE}Airport Construct.
+STR_A000_AIRPORTS										:{WHITE}Airports
 STR_A001_CAN_T_BUILD_AIRPORT_HERE				:{WHITE}Can't build airport here...
 STR_A002_AIRCRAFT_HANGAR					:{WHITE}{STATION} Aircraft Hangar
 STR_A003_NEW_AIRCRAFT						:{BLACK}New Aircraft
 STR_A004_INFORMATION						:{BLACK}Information
 STR_A005_NEW_AIRCRAFT						:{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT						:{BLACK}Build Aircraft
 STR_A007_COST_SPEED_CAPACITY_PASSENGERS				:{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}{}{BLACK}Capacity: {GOLD}{COMMA16} passengers, {COMMA16} bags of mail{}{BLACK}Running Cost: {GOLD}{CURRENCY}/yr{}{BLACK}Designed: {GOLD}{NUMU16}{BLACK}  Life: {GOLD}{COMMA16} years{}{BLACK}Max. Reliability: {GOLD}{COMMA8}%
 STR_A008_CAN_T_BUILD_AIRCRAFT					:{WHITE}Can't build aircraft...
 STR_A009_AIRCRAFT						:{WHITE}{STRING} - {COMMA16} Aircraft
 STR_A00A							:{WHITE}{STRING}
 STR_A00B_ORDERS							:{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS						:{WHITE}{STRING} (Details)

lang/english.txt

➞

Show inline comments

@@ @@ -1105,24 +1105,25 @@ STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE} @@
 STR_BUILD_AUTORAIL_TIP					:{BLACK}Build railway track using the Autorail mode
 STR_NO_TOWN_IN_SCENARIO					:{WHITE}...there is no town in this scenario
 STR_GENERATE_RANDOM_LANDSCAPE		:{WHITE}Are you sure you want to create a random landscape?
 STR_MANY_RANDOM_TOWNS						:{BLACK}Many random towns
 STR_RANDOM_TOWNS_TIP						:{BLACK}Cover the map with randomly placed towns
 STR_MANY_RANDOM_INDUSTRIES			:{BLACK}Many random industries
 STR_RANDOM_INDUSTRIES_TIP				:{BLACK}Cover the map with randomly placed industries
 STR_CAN_T_GENERATE_INDUSTRIES		:{WHITE}Can't generate industries...
 STR_LANDSCAPING_TOOLBAR_TIP			:{BLACK}Open the landscaping toolbar to raise/lower land, plant trees, etc.
 STR_LANDSCAPING_TOOLBAR					:{WHITE}Landscaping
 STR_LEVEL_LAND_TOOLTIP					:{BLACK}Level land
 STR_TREES_RANDOM_TYPE					:{BLACK}Trees of random type
 STR_TREES_RANDOM_TYPE_TIP				:{BLACK}Place trees of random type
 STR_CANT_BUILD_CANALS							:{WHITE}Can't build canals here...
 STR_BUILD_CANALS_TIP							:{BLACK}Build canals
 STR_LANDINFO_CANAL								:Canal
 STR_CANT_BUILD_LOCKS							:{WHITE}Can't build locks here...
@@ @@ -2566,25 +2567,25 @@ STR_983A_REFIT_CARGO_SHIP_TO_CARRY :{BL @@
 STR_983B_REFIT							:{WHITE}{STRING} (Refit)
 STR_983C_REFIT_SHIP						:{BLACK}Refit ship
 STR_983D_SELECT_TYPE_OF_CARGO_FOR		:{BLACK}Select type of cargo for ship to carry
 STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED:{BLACK}Refit ship to carry highlighted cargo type
 STR_983F_SELECT_CARGO_TYPE_TO_CARRY		:{GOLD}Select cargo type to carry:-
 STR_9840_NEW_CAPACITY_COST_OF_REFIT		:{BLACK}New capacity: {GOLD}{STRING}{}{BLACK}Cost of refit: {GOLD}{CURRENCY}
 STR_9841_CAN_T_REFIT_SHIP				:{WHITE}Can't refit ship...
 STR_9842_REFITTABLE						:(refittable)
 STR_GO_TO_SHIP_DEPOT					:Go to {TOWN} Ship Depot
 SERVICE_AT_SHIP_DEPOT					:Service at {TOWN} Ship Depot
 ##id 0xA000
-STR_A000_AIRPORT_CONSTRUCT				:{WHITE}Airport Construct.
+STR_A000_AIRPORTS				:{WHITE}Airports
 STR_A001_CAN_T_BUILD_AIRPORT_HERE		:{WHITE}Can't build airport here...
 STR_A002_AIRCRAFT_HANGAR				:{WHITE}{STATION} Aircraft Hangar
 STR_A003_NEW_AIRCRAFT					:{BLACK}New Aircraft
 STR_A004_INFORMATION					:{BLACK}Information
 STR_A005_NEW_AIRCRAFT					:{WHITE}New Aircraft
 STR_A006_BUILD_AIRCRAFT					:{BLACK}Build Aircraft
 STR_A007_COST_SPEED_CAPACITY_PASSENGERS	:{BLACK}Cost: {GOLD}{CURRENCY}{BLACK} Speed: {GOLD}{VELOCITY}{}{BLACK}Capacity: {GOLD}{COMMA16} passengers, {COMMA16} bags of mail{}{BLACK}Running Cost: {GOLD}{CURRENCY}/yr{}{BLACK}Designed: {GOLD}{NUMU16}{BLACK}  Life: {GOLD}{COMMA16} years{}{BLACK}Max. Reliability: {GOLD}{COMMA8}%
 STR_A008_CAN_T_BUILD_AIRCRAFT			:{WHITE}Can't build aircraft...
 STR_A009_AIRCRAFT						:{WHITE}{STRING} - {COMMA16} Aircraft
 STR_A00A								:{WHITE}{STRING}
 STR_A00B_ORDERS							:{WHITE}{STRING} (Orders)
 STR_A00C_DETAILS						:{WHITE}{STRING} (Details)

main_gui.c

➞

Show inline comments

@@ @@ -1889,25 +1889,25 @@ static const Widget _toolb_normal_widget @@
 {      WWT_PANEL,    14,   310,   331,     0,    21, 0x2DB, STR_017B_DISPLAY_LIST_OF_COMPANY},
 {      WWT_PANEL,    14,   332,   353,     0,    21, 0x2DC, STR_017C_DISPLAY_LIST_OF_COMPANY},
 {      WWT_PANEL,    14,   354,   375,     0,    21, 0x2DD, STR_017D_DISPLAY_LIST_OF_COMPANY},
 {      WWT_PANEL,    14,   376,   397,     0,    21, 0x2DE, STR_017E_DISPLAY_LIST_OF_COMPANY},
 {      WWT_PANEL,    14,   406,   427,     0,    21, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
 {      WWT_PANEL,    14,   428,   449,     0,    21, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
 {      WWT_PANEL,    14,   457,   478,     0,    21, 0x2D7, STR_0181_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,    14,   479,   500,     0,    21, 0x2D8, STR_0182_BUILD_ROADS},
 {      WWT_PANEL,    14,   501,   522,     0,    21, 0x2D9, STR_0183_BUILD_SHIP_DOCKS},
 {      WWT_PANEL,    14,   523,   544,     0,    21, 0x2DA, STR_0184_BUILD_AIRPORTS},
-{      WWT_PANEL,    14,   545,   566,     0,    21, 0xFF3, STR_0185_PLANT_TREES_PLACE_SIGNS}, // tree icon is 0x2E6
+{      WWT_PANEL,    14,   545,   566,     0,    21, 0xFF3, STR_LANDSCAPING_TOOLBAR_TIP}, // tree icon is 0x2E6
 {      WWT_PANEL,    14,   574,   595,     0,    21, 0x2C9, STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
 {      WWT_PANEL,    14,   596,   617,     0,    21, 0x2A8, STR_0203_SHOW_LAST_MESSAGE_NEWS},
 {      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3, STR_0186_LAND_BLOCK_INFORMATION},
 {   WIDGETS_END},
 };
 static const WindowDesc _toolb_normal_desc = {
 , 0, 640, 22,
 	WC_MAIN_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET,
 	_toolb_normal_widgets,

misc_gui.c

➞

Show inline comments

@@ @@ -317,25 +317,25 @@ static const Widget _build_trees_widgets @@
 {      WWT_PANEL,    14,    72,   105,    63,   108, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,   107,   140,    63,   108, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,     2,    35,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    37,    70,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    72,   105,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,   107,   140,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {		WWT_CLOSEBOX,    14,   2,   140,   157,   168, STR_TREES_RANDOM_TYPE, STR_TREES_RANDOM_TYPE_TIP},
 {    WIDGETS_END},
 };
 static const WindowDesc _build_trees_desc = {
 , 22, 143, 171,
-	WC_BUILD_TOOLBAR,0,
+	WC_BUILD_TREES, WC_SCEN_LAND_GEN,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_trees_widgets,
 	BuildTreesWndProc
 };
 static const Widget _build_trees_scen_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   142,     0,    13, STR_2802_TREES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   142,    14,   183, 0x0,							STR_NULL},
 {      WWT_PANEL,    14,     2,    35,    16,    61, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    37,    70,    16,    61, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    72,   105,    16,    61, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
@@ @@ -346,34 +346,33 @@ static const Widget _build_trees_scen_wi @@
 {      WWT_PANEL,    14,   107,   140,    63,   108, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,     2,    35,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    37,    70,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,    72,   105,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {      WWT_PANEL,    14,   107,   140,   110,   155, 0x0,							STR_280D_SELECT_TREE_TYPE_TO_PLANT},
 {		WWT_CLOSEBOX,    14,		 2,   140,   157,   168, STR_TREES_RANDOM_TYPE,	STR_TREES_RANDOM_TYPE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   140,   170,   181, STR_028A_RANDOM_TREES,	STR_028B_PLANT_TREES_RANDOMLY_OVER},
 {    WIDGETS_END},
 };
 static const WindowDesc _build_trees_scen_desc = {
 	-1, -1, 143, 184,
-	WC_SCEN_BUILD_TREES,0,
+	WC_BUILD_TREES,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_trees_scen_widgets,
 	BuildTreesWndProc
 };
 void ShowBuildTreesToolbar()
+{
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDesc(&_build_trees_desc);
+}
 void ShowBuildTreesScenToolbar()
+{
 	AllocateWindowDescFront(&_build_trees_scen_desc, 0);
+}
 static uint32 _errmsg_decode_params[10];
 static StringID _errmsg_message_1, _errmsg_message_2;
 static uint _errmsg_duration;

rail_gui.c

➞

Show inline comments

@@ @@ -202,132 +202,122 @@ void PlaceProc_BuyLand(uint tile) @@
+}
 static void PlaceRail_ConvertRail(uint tile)
+{
 	VpStartPlaceSizing(tile, VPM_X_AND_Y | (1<<4));
+}
 static void PlaceRail_AutoSignals(uint tile)
+{
 	VpStartPlaceSizing(tile, VPM_SIGNALDIRS);
+}
 static void BuildRailClick_AutoRail(Window *w)
+{
 	HandlePlacePushButton(w, 3, _cur_railtype + SPR_OPENTTD_BASE + 4, 1, PlaceRail_AutoRail);
+}
 static void BuildRailClick_N(Window *w)
+{
-	HandlePlacePushButton(w, 4, _cur_railtype*4 + 0x4EF, 1, PlaceRail_N);
+	HandlePlacePushButton(w, 3, _cur_railtype*4 + 0x4EF, 1, PlaceRail_N);
+}
 static void BuildRailClick_NE(Window *w)
+{
-	HandlePlacePushButton(w, 5, _cur_railtype*4 + 0x4F0, 1, PlaceRail_NE);
+	HandlePlacePushButton(w, 4, _cur_railtype*4 + 0x4F0, 1, PlaceRail_NE);
+}
 static void BuildRailClick_E(Window *w)
+{
-	HandlePlacePushButton(w, 6, _cur_railtype*4 + 0x4F1, 1, PlaceRail_E);
+	HandlePlacePushButton(w, 5, _cur_railtype*4 + 0x4F1, 1, PlaceRail_E);
+}
 static void BuildRailClick_NW(Window *w)
+{
 	HandlePlacePushButton(w, 7, _cur_railtype*4 + 0x4F2, 1, PlaceRail_NW);
 	HandlePlacePushButton(w, 6, _cur_railtype*4 + 0x4F2, 1, PlaceRail_NW);
+}
 static void BuildRailClick_AutoRail(Window *w)
+{
 	HandlePlacePushButton(w, 7, _cur_railtype + SPR_OPENTTD_BASE + 4, 1, PlaceRail_AutoRail);
+}
 static void BuildRailClick_Demolish(Window *w)
+{
 	HandlePlacePushButton(w, 8, ANIMCURSOR_DEMOLISH, 1, PlaceProc_DemolishArea);
+}
 static void BuildRailClick_Lower(Window *w)
+{
 	HandlePlacePushButton(w, 9, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+}
 static void BuildRailClick_Raise(Window *w)
+{
 	HandlePlacePushButton(w, 10, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
+}
 static const SpriteID _depot_cursors[] = {
 x510,
 	SPR_OPENTTD_BASE + 14,
 	SPR_OPENTTD_BASE + 15,
 };
 static void BuildRailClick_Depot(Window *w)
+{
 	if (HandlePlacePushButton(w, 11, _depot_cursors[_cur_railtype], 1, PlaceRail_Depot)) ShowBuildTrainDepotPicker();
 	if (HandlePlacePushButton(w, 9, _depot_cursors[_cur_railtype], 1, PlaceRail_Depot)) ShowBuildTrainDepotPicker();
+}
 static void BuildRailClick_Waypoint(Window *w)
+{
 	_waypoint_count = GetCustomStationsCount(STAT_CLASS_WAYP);
 	if (HandlePlacePushButton(w, 10, SPR_OPENTTD_BASE + 7, 1, PlaceRail_Waypoint)
 	    && _waypoint_count > 1)
 		ShowBuildWaypointPicker();
+}
 static void BuildRailClick_Station(Window *w)
+{
-	if (HandlePlacePushButton(w, 12, 0x514, 1, PlaceRail_Station)) ShowStationBuilder();
+	if (HandlePlacePushButton(w, 11, 0x514, 1, PlaceRail_Station)) ShowStationBuilder();
+}
 static void BuildRailClick_AutoSignals(Window *w)
+{
-	HandlePlacePushButton(w, 13, ANIMCURSOR_BUILDSIGNALS , 1, PlaceRail_AutoSignals);
+	HandlePlacePushButton(w, 12, ANIMCURSOR_BUILDSIGNALS , 1, PlaceRail_AutoSignals);
+}
 static void BuildRailClick_Bridge(Window *w)
+{
-	HandlePlacePushButton(w, 14, 0xA21, 1, PlaceRail_Bridge);
+	HandlePlacePushButton(w, 13, 0xA21, 1, PlaceRail_Bridge);
+}
 static void BuildRailClick_Tunnel(Window *w)
+{
-	HandlePlacePushButton(w, 15, 0x982 + _cur_railtype, 3, PlaceRail_Tunnel);
+	HandlePlacePushButton(w, 14, 0x982 + _cur_railtype, 3, PlaceRail_Tunnel);
+}
 static void BuildRailClick_Remove(Window *w)
+{
-	if (w->disabled_state & (1<<16))
+	if (w->disabled_state & (1<<15))
 		return;
 	SetWindowDirty(w);
 	SndPlayFx(SND_15_BEEP);
-	_thd.make_square_red = !!((w->click_state ^= (1 << 16)) & (1<<16));
+	_thd.make_square_red = !!((w->click_state ^= (1 << 15)) & (1<<15));
 	MarkTileDirty(_thd.pos.x, _thd.pos.y);
-	_remove_button_clicked = (w->click_state & (1 << 16)) != 0;
+	_remove_button_clicked = (w->click_state & (1 << 15)) != 0;
 	// handle station builder
-	if( w->click_state & (1 << 12) )
+	if( w->click_state & (1 << 15) )
+	{
 		if(_remove_button_clicked)
 			SetTileSelectSize(1, 1);
 		else
 			BringWindowToFrontById(WC_BUILD_STATION, 0);
+	}
+}
-static void BuildRailClick_Sign(Window *w)
+static void BuildRailClick_Convert(Window *w)
+{
-	HandlePlacePushButton(w, 17, 0x12B8, 1, PlaceProc_BuyLand);
+	HandlePlacePushButton(w, 16, (SPR_OPENTTD_BASE + 26) + _cur_railtype * 2, 1, PlaceRail_ConvertRail);
+}
-static void BuildRailClick_Waypoint(Window *w)
+static void BuildRailClick_Landscaping(Window *w)
+{
 	_waypoint_count = GetCustomStationsCount(STAT_CLASS_WAYP);
 	if (HandlePlacePushButton(w, 18, SPR_OPENTTD_BASE + 7, 1, PlaceRail_Waypoint)
 	    && _waypoint_count > 1)
 		ShowBuildWaypointPicker();
+}
 static void BuildRailClick_Convert(Window *w)
+{
 	HandlePlacePushButton(w, 19, (SPR_OPENTTD_BASE + 26) + _cur_railtype * 2, 1, PlaceRail_ConvertRail);
 	ShowTerraformToolbar();
+}
 static void DoRailroadTrack(int mode)
+{
 	DoCommandP(TILE_FROM_XY(_thd.selstart.x, _thd.selstart.y), PACK_POINT(_thd.selend.x, _thd.selend.y), (mode << 4) | _cur_railtype, NULL,
 		_remove_button_clicked ?
 		CMD_REMOVE_RAILROAD_TRACK | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_1012_CAN_T_REMOVE_RAILROAD_TRACK) :
 		CMD_BUILD_RAILROAD_TRACK | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_1011_CAN_T_BUILD_RAILROAD_TRACK)
 	);
+}
@@ @@ -554,73 +544,70 @@ static void HandleAutoSignalPlacement() @@
 		/* _patches.drag_signals_density is given as a parameter such that each user in a network
 		 * game can specify his/her own signal density */
 		DoCommandP(TILE_FROM_XY(thd->selstart.x, thd->selstart.y), TILE_FROM_XY(thd->selend.x, thd->selend.y),
 		(mode << 4) | (_remove_button_clicked + (_ctrl_pressed ? 8 : 0)) | (trackstat << 8) | (_patches.drag_signals_density << 24),
 		CcPlaySound1E,
 		(_remove_button_clicked ?	CMD_BUILD_MANY_SIGNALS | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_1013_CAN_T_REMOVE_SIGNALS_FROM) :
 															CMD_BUILD_MANY_SIGNALS | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_1010_CAN_T_BUILD_SIGNALS_HERE) ) );
+	}
+}
 static OnButtonClick * const _build_railroad_button_proc[] = {
 	BuildRailClick_AutoRail,
 	BuildRailClick_N,
 	BuildRailClick_NE,
 	BuildRailClick_E,
 	BuildRailClick_NW,
 	BuildRailClick_AutoRail,
 	BuildRailClick_Demolish,
 	BuildRailClick_Lower,
 	BuildRailClick_Raise,
 	BuildRailClick_Depot,
 	BuildRailClick_Waypoint,
 	BuildRailClick_Station,
 	BuildRailClick_AutoSignals,
 	BuildRailClick_Bridge,
 	BuildRailClick_Tunnel,
 	BuildRailClick_Remove,
 	BuildRailClick_Sign,
 	BuildRailClick_Waypoint,
 	BuildRailClick_Convert,
 	BuildRailClick_Landscaping,
 };
 static const uint16 _rail_keycodes[] = {
 	'5',
 	'1',
 	'2',
 	'3',
 	'4',
 	'5',
 	'6',
 	'7',
 	'8',
 ,	// depot
 ,	// station
 	'S',// signals
 	'B',// bridge
 	'T',// tunnel
 	'R',// remove
 ,	// sign
 	'C',// waypoint
 	'7', // depot
 	'8', // waypoint
 	'9', // station
 	'S', // signals
 	'B', // bridge
 	'T', // tunnel
 	'R', // remove
 	'C', // convert rail
 	'L', // landscaping
 };
 static void BuildRailToolbWndProc(Window *w, WindowEvent *e)
+{
 	switch(e->event) {
 	case WE_PAINT:
 		w->disabled_state &= ~(1 << 16);
 		if (!(w->click_state & ((1<<3)|(1<<4)|(1<<5)|(1<<6)|(1<<7)|(1<<12)|(1<<13)|(1<<18)))) {
 			w->disabled_state |= (1 << 16);
 			w->click_state &= ~(1<<16);
 		w->disabled_state &= ~(1 << 15);
 		if (!(w->click_state & ((1<<3)|(1<<4)|(1<<5)|(1<<6)|(1<<7)|(1<<10)|(1<<11)|(1<<12)))) {
 			w->disabled_state |= (1 << 15);
 			w->click_state &= ~(1<<15);
+		}
 		DrawWindowWidgets(w);
 		break;
 	case WE_CLICK:
 		if (e->click.widget >= 3) {
 			_remove_button_clicked = false;
 			_build_railroad_button_proc[e->click.widget - 3](w);
+		}
 	break;
 	case WE_KEYPRESS: {
@@ @@ -682,130 +669,127 @@ static void BuildRailToolbWndProc(Window @@
 		w = FindWindowById(WC_BUILD_DEPOT, 0);
 		if (w != NULL) WP(w,def_d).close=true;
 		break;
 	case WE_PLACE_PRESIZE: {
 		uint tile = e->place.tile;
 		DoCommandByTile(tile, 0, 0, DC_AUTO, CMD_BUILD_TUNNEL);
 		VpSetPresizeRange(tile, _build_tunnel_endtile==0?tile:_build_tunnel_endtile);
 	} break;
+	}
+}
 static const Widget _build_railroad_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,     7,    11,   417,     0,    13, STR_100A_RAILROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{    WWT_CAPTION,     7,    11,   371,     0,    13, STR_100A_RAILROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,    110,  113,    14,    35, 0x0,			STR_NULL},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 0, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,   110,   113,    14,    35, 0x0,			STR_NULL},
 {      WWT_PANEL,     7,    0,     21,    14,    35, 0x4E3,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    22,    43,    14,    35, 0x4E4,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    44,    65,    14,    35, 0x4E5,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    66,    87,    14,    35, 0x4E6,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 0, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,   114,   135,    14,    35, 0x2BF,		STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,   136,   157,    14,    35, 0x2B7,		STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   158,   179,    14,    35, 0x2B6,		STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   180,   201,    14,    35, 0x50E,		STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   136,   157,    14,    35, 0x50E,		STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   158,   179,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   224,   265,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   266,   287,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   288,   329,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   330,   351,    14,    35, 0x97E,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   352,   373,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   374,   395,    14,    35, 0x12B7,	STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {      WWT_PANEL,     7,   180,   221,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   222,   243,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   244,   285,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   286,   305,    14,    35, 0x97E,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   306,   327,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   328,   349,    14,    35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   350,   371,    14,    35, SPR_IMG_LANDSCAPING_S,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_railroad_desc = {
--418, 22, 418, 36,
+-372, 22, 372, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_railroad_widgets,
 	BuildRailToolbWndProc
 };
 static const Widget _build_monorail_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,     7,    11,   417,     0,    13, STR_100B_MONORAIL_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{    WWT_CAPTION,     7,    11,   371,     0,    13, STR_100B_MONORAIL_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,   110,   113,    14,    35, 0x0,			STR_NULL},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 1, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,     0,    21,    14,    35, 0x4E7,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    22,    43,    14,    35, 0x4E8,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    44,    65,    14,    35, 0x4E9,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    66,    87,    14,    35, 0x4EA,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 1, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,   114,   135,    14,    35, 0x2BF,		STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,   136,   157,    14,    35, 0x2B7,		STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   158,   179,    14,    35, 0x2B6,		STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   180,   201,    14,    35, SPR_OPENTTD_BASE + 12, STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   136,   157,    14,    35, SPR_OPENTTD_BASE + 12, STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   158,   179,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   224,   265,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   266,   287,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   288,   329,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   330,   351,    14,    35, 0x97F,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   352,   373,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   374,   395,    14,    35, 0x12B7,	STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {      WWT_PANEL,     7,   180,   221,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   222,   243,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   244,   285,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   286,   305,    14,    35, 0x97F,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   306,   327,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   328,   349,    14,    35, SPR_OPENTTD_BASE + 27, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 27, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   350,   371,    14,    35, 742,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_monorail_desc = {
--418, 22, 418, 36,
+-372, 22, 372, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_monorail_widgets,
 	BuildRailToolbWndProc
 };
 static const Widget _build_maglev_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,     7,    11,   417,     0,    13, STR_100C_MAGLEV_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{    WWT_CAPTION,     7,    11,   371,     0,    13, STR_100C_MAGLEV_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,   110,   113,    14,    35, 0x0,			STR_NULL},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 2, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,     0,    21,    14,    35, 0x4EB,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    22,    43,    14,    35, 0x4EC,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    44,    65,    14,    35, 0x4EE,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    66,    87,    14,    35, 0x4ED,		STR_1018_BUILD_RAILROAD_TRACK},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_OPENTTD_BASE + 2, STR_BUILD_AUTORAIL_TIP},
 {      WWT_PANEL,     7,   114,   135,    14,    35, 0x2BF,		STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,   136,   157,    14,    35, 0x2B7,		STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   158,   179,    14,    35, 0x2B6,		STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   180,   201,    14,    35, SPR_OPENTTD_BASE + 13, STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   136,   157,    14,    35, SPR_OPENTTD_BASE + 13, STR_1019_BUILD_TRAIN_DEPOT_FOR_BUILDING},
 {      WWT_PANEL,     7,   158,   179,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   224,   265,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   266,   287,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   288,   329,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   330,   351,    14,    35, 0x980,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   352,   373,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   374,   395,    14,    35, 0x12B7,	STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {      WWT_PANEL,     7,   180,   221,    14,    35, 0x512,		STR_101A_BUILD_RAILROAD_STATION},
 {      WWT_PANEL,     7,   222,   243,    14,    35, 0x50B,		STR_101B_BUILD_RAILROAD_SIGNALS},
 {      WWT_PANEL,     7,   244,   285,    14,    35, 0xA22,		STR_101C_BUILD_RAILROAD_BRIDGE},
 {      WWT_PANEL,     7,   286,   305,    14,    35, 0x980,		STR_101D_BUILD_RAILROAD_TUNNEL},
 {      WWT_PANEL,     7,   306,   327,    14,    35, 0x2CA,		STR_101E_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   328,   349,    14,    35, SPR_OPENTTD_BASE + 29, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 29, STR_CONVERT_RAIL_TIP},
 {      WWT_PANEL,     7,   350,   371,    14,    35, 742,	STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_maglev_desc = {
--418, 22, 418, 36,
+-372, 22, 372, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_maglev_widgets,
 	BuildRailToolbWndProc
 };
 static const WindowDesc * const _build_rr_desc[] = {
 	&_build_railroad_desc,
 	&_build_monorail_desc,
 	&_build_maglev_desc,
 };

road_gui.c

➞

Show inline comments

@@ @@ -111,125 +111,115 @@ static void BuildRoadClick_NE(Window *w) @@
 static void BuildRoadClick_NW(Window *w)
+{
 	_build_road_flag = 0;
 	HandlePlacePushButton(w, 3, 0x520, 1, PlaceRoad_NW);
+}
 static void BuildRoadClick_Demolish(Window *w)
+{
 	HandlePlacePushButton(w, 4, ANIMCURSOR_DEMOLISH, 1, PlaceRoad_DemolishArea);
+}
 static void BuildRoadClick_Lower(Window *w)
+{
 	HandlePlacePushButton(w, 5, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+}
 static void BuildRoadClick_Raise(Window *w)
+{
 	HandlePlacePushButton(w, 6, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
+}
 static void BuildRoadClick_Depot(Window *w)
+{
-	if (HandlePlacePushButton(w, 7, 0x511, 1, PlaceRoad_Depot)) ShowRoadDepotPicker();
+	if (HandlePlacePushButton(w, 5, 0x511, 1, PlaceRoad_Depot)) ShowRoadDepotPicker();
+}
 static void BuildRoadClick_BusStation(Window *w)
+{
-	if (HandlePlacePushButton(w, 8, 0xAA5, 1, PlaceRoad_BusStation)) ShowBusStationPicker();
+	if (HandlePlacePushButton(w, 6, 0xAA5, 1, PlaceRoad_BusStation)) ShowBusStationPicker();
+}
 static void BuildRoadClick_TruckStation(Window *w)
+{
-	if (HandlePlacePushButton(w, 9, 0xAA6, 1, PlaceRoad_TruckStation)) ShowTruckStationPicker();
+	if (HandlePlacePushButton(w, 7, 0xAA6, 1, PlaceRoad_TruckStation)) ShowTruckStationPicker();
+}
 static void BuildRoadClick_Bridge(Window *w)
+{
 	_build_road_flag = 0;
-	HandlePlacePushButton(w, 10, 0xA21, 1, PlaceRoad_Bridge);
+	HandlePlacePushButton(w, 8, 0xA21, 1, PlaceRoad_Bridge);
+}
 static void BuildRoadClick_Tunnel(Window *w)
+{
 	_build_road_flag = 0;
-	HandlePlacePushButton(w, 11, 0x981, 3, PlaceRoad_Tunnel);
+	HandlePlacePushButton(w, 9, 0x981, 3, PlaceRoad_Tunnel);
+}
 static void BuildRoadClick_Remove(Window *w)
+{
-	if (w->disabled_state & (1<<12))
+	if (w->disabled_state & (1<<10))
 		return;
 	SetWindowDirty(w);
 	SndPlayFx(SND_15_BEEP);
-	_thd.make_square_red = !!((w->click_state ^= (1 << 12)) & (1<<12));
+	_thd.make_square_red = !!((w->click_state ^= (1 << 10)) & (1<<10));
 	MarkTileDirty(_thd.pos.x, _thd.pos.y);
+}
-static void BuildRoadClick_Purchase(Window *w)
+static void BuildRoadClick_Landscaping(Window *w)
+{
-	HandlePlacePushButton(w, 13, 0x12B8, 1, PlaceProc_BuyLand);
+	ShowTerraformToolbar();
+}
 static OnButtonClick * const _build_road_button_proc[] = {
 	BuildRoadClick_NE,
 	BuildRoadClick_NW,
 	BuildRoadClick_Demolish,
 	BuildRoadClick_Lower,
 	BuildRoadClick_Raise,
 	BuildRoadClick_Depot,
 	BuildRoadClick_BusStation,
 	BuildRoadClick_TruckStation,
 	BuildRoadClick_Bridge,
 	BuildRoadClick_Tunnel,
 	BuildRoadClick_Remove,
-	BuildRoadClick_Purchase,
+	BuildRoadClick_Landscaping,
 };
 static void BuildRoadToolbWndProc(Window *w, WindowEvent *e) {
 	switch(e->event) {
 	case WE_PAINT:
 		w->disabled_state &= ~(1 << 12);
 		if (!(w->click_state & 12)) {
 			w->disabled_state |= (1 << 12);
 			w->click_state &= ~(1<<12);
 		w->disabled_state &= ~(1 << 10);
 		if (!(w->click_state & ((1<<2)|(1<<3)))) {
 			w->disabled_state |= (1 << 10);
 			w->click_state &= ~(1<<10);
+		}
 		DrawWindowWidgets(w);
 		break;
 	case WE_CLICK: {
 		if (e->click.widget >= 2)
 			_build_road_button_proc[e->click.widget - 2](w);
 	}	break;
 	case WE_KEYPRESS:
 		switch(e->keypress.keycode) {
 		case '1': BuildRoadClick_NE(w); break;
 		case '2': BuildRoadClick_NW(w); break;
 		case '3': BuildRoadClick_Demolish(w); break;
 		case '4': BuildRoadClick_Lower(w); break;
 		case '5': BuildRoadClick_Raise(w); break;
 		case '4': BuildRoadClick_Depot(w); break;
 		case '5': BuildRoadClick_BusStation(w); break;
 		case '6': BuildRoadClick_TruckStation(w); break;
 		case 'B': BuildRoadClick_Bridge(w); break;
 		case 'T': BuildRoadClick_Tunnel(w); break;
 		case 'R': BuildRoadClick_Remove(w); break;
 		case 'L': BuildRoadClick_Landscaping(w); break;
 		default:
 			return;
+		}
 		e->keypress.cont = false;
 		break;
 	case WE_PLACE_OBJ:
-		_remove_button_clicked = (w->click_state & (1 << 12)) != 0;
+		_remove_button_clicked = (w->click_state & (1 << 10)) != 0;
 		_place_proc(e->place.tile);
 		break;
 	case WE_ABORT_PLACE_OBJ:
 		w->click_state = 0;
 		SetWindowDirty(w);
 		w = FindWindowById(WC_BUS_STATION, 0);
 		if (w != NULL) WP(w,def_d).close=true;
 		w = FindWindowById(WC_TRUCK_STATION, 0);
 		if (w != NULL) WP(w,def_d).close=true;
 		w = FindWindowById(WC_BUILD_DEPOT, 0);
@@ @@ -274,42 +264,41 @@ static void BuildRoadToolbWndProc(Window @@
 	case WE_PLACE_PRESIZE: {
 		uint tile = e->place.tile;
 		DoCommandByTile(tile, 0x200, 0, DC_AUTO, CMD_BUILD_TUNNEL);
 		VpSetPresizeRange(tile, _build_tunnel_endtile==0?tile:_build_tunnel_endtile);
 		break;
+	}
+	}
+}
 static const Widget _build_road_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   283,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    21,    14,    35, 0x51D, STR_180B_BUILD_ROAD_SECTION},
 {      WWT_PANEL,     7,    22,    43,    14,    35, 0x51E, STR_180B_BUILD_ROAD_SECTION},
 {      WWT_PANEL,     7,    44,    65,    14,    35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    66,    87,    14,    35, 0x2B7, STR_018E_LOWER_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,    88,   109,    14,    35, 0x2B6, STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_PANEL,     7,   110,   131,    14,    35, 0x50F, STR_180C_BUILD_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,     7,   132,   153,    14,    35, 0x2ED, STR_180D_BUILD_BUS_STATION},
 {      WWT_PANEL,     7,   154,   175,    14,    35, 0x2EE, STR_180E_BUILD_TRUCK_LOADING_BAY},
 {      WWT_PANEL,     7,   176,   217,    14,    35, 0xA22, STR_180F_BUILD_ROAD_BRIDGE},
 {      WWT_PANEL,     7,   218,   239,    14,    35, 0x97D, STR_1810_BUILD_ROAD_TUNNEL},
 {      WWT_PANEL,     7,   240,   261,    14,    35, 0x2CA, STR_1811_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   262,   283,    14,    35, 0x12B7, STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {    WWT_CAPTION,     7,    11,   239,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,    21,    14,    35, SPR_IMG_ROAD_NW,				STR_180B_BUILD_ROAD_SECTION},
 {      WWT_PANEL,     7,    22,    43,    14,    35, SPR_IMG_ROAD_NE,				STR_180B_BUILD_ROAD_SECTION},
 {      WWT_PANEL,     7,    44,    65,    14,    35, SPR_IMG_DYNAMITE,			STR_018D_DEMOLISH_BUILDINGS_ETC},
 {      WWT_PANEL,     7,    66,    87,    14,    35, SPR_IMG_ROAD_DEPOT,		STR_180C_BUILD_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,     7,    88,   109,    14,    35, SPR_IMG_BUS_STATION,		STR_180D_BUILD_BUS_STATION},
 {      WWT_PANEL,     7,   110,   131,    14,    35, SPR_IMG_TRUCK_BAY,			STR_180E_BUILD_TRUCK_LOADING_BAY},
 {      WWT_PANEL,     7,   132,   173,    14,    35, SPR_IMG_BRIDGE,				STR_180F_BUILD_ROAD_BRIDGE},
 {      WWT_PANEL,     7,   174,   195,    14,    35, SPR_IMG_ROAD_TUNNEL,		STR_1810_BUILD_ROAD_TUNNEL},
 {      WWT_PANEL,     7,   196,   217,    14,    35, SPR_IMG_REMOVE, 				STR_1811_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_PANEL,     7,   218,   239,    14,    35, SPR_IMG_LANDSCAPING_S, STR_LANDSCAPING_TOOLBAR_TIP},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_desc = {
-, 22, 284, 36,
+-240, 22, 240, 36,
 	WC_BUILD_TOOLBAR,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_road_widgets,
 	BuildRoadToolbWndProc
 };
 void ShowBuildRoadToolbar()
+{
 	DeleteWindowById(WC_BUILD_TOOLBAR, 0);
 	AllocateWindowDesc(&_build_road_desc);
+}

table/sprites.h

➞

Show inline comments

@@ @@ -705,25 +705,36 @@ enum Sprites { @@
 	/* OPEN TRANSPORT TYCOON in gamescreen */
 	SPR_OTTD_O                = 4842,
 	SPR_OTTD_P                = 4841,
 	SPR_OTTD_E                = SPR_OPENTTD_BASE + 16,
 	SPR_OTTD_D                = SPR_OPENTTD_BASE + 17,
 	SPR_OTTD_N                = 4839,
 	SPR_OTTD_T                = 4836,
 	SPR_OTTD_R                = 4837,
 	SPR_OTTD_A                = 4838,
 	SPR_OTTD_S                = 4840,
 	SPR_OTTD_Y                = 4843,
 	SPR_OTTD_C                = 4844
 	SPR_OTTD_C                = 4844,
 	/* road_gui.c */
 	SPR_IMG_ROAD_NW				= 1309,
 	SPR_IMG_ROAD_NE				= 1310,
 	SPR_IMG_ROAD_DEPOT		= 1295,
 	SPR_IMG_BUS_STATION		= 749,
 	SPR_IMG_TRUCK_BAY			= 750,
 	SPR_IMG_BRIDGE				= 2594,
 	SPR_IMG_ROAD_TUNNEL		= 2429,
 	SPR_IMG_REMOVE				= 714,
 	SPR_IMG_LANDSCAPING_S = 742
 };
 /* Cursor sprite numbers */
 typedef enum CursorSprites {
 	/* Terraform */
 	/* Cursors */
 	SPR_CURSOR_MOUSE          = 0,
 	SPR_CURSOR_ZZZ            = 1,
 	SPR_CURSOR_BOUY           = 702,
 	SPR_CURSOR_QUERY          = 719,
 	SPR_CURSOR_HQ             = 720,
 	SPR_CURSOR_SHIP_DEPOT     = 721,

terraform_gui.c

➞

Show inline comments

@@ @@ -23,31 +23,31 @@ static void GenericRaiseLowerLand(uint t @@
+{
 	if (mode) {
 		DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_AUTO | CMD_MSG(STR_0808_CAN_T_RAISE_LAND_HERE));
 	} else {
 		DoCommandP(tile, 8, (uint32)mode, CcTerraform, CMD_TERRAFORM_LAND | CMD_AUTO | CMD_MSG(STR_0809_CAN_T_LOWER_LAND_HERE));
+	}
+}
 typedef void OnButtonClick(Window *w);
 static const uint16 _terraform_keycodes[] = {
 	'1',
 	'2',
 	'3',
 	'4',
 	'5',
 	'Q',
 	'W',
 	'E',
 ,
 	'7',
 	'Z',
 	'U',
 	'I',
 };
 void PlaceProc_DemolishArea(uint tile)
+{
 	VpStartPlaceSizing(tile, VPM_X_AND_Y);
+}
 void PlaceProc_RaiseLand(uint tile)
+{
 	GenericRaiseLowerLand(tile, 1);
+}
@@ @@ -57,83 +57,75 @@ void PlaceProc_LowerLand(uint tile) @@
+}
 void PlaceProc_LevelLand(uint tile)
+{
 	VpStartPlaceSizing(tile, VPM_X_AND_Y | (2<<4));
+}
 void PlaceProc_PlantTree(uint tile)
+{
+}
 static void TerraformClick_Dynamite(Window *w)
+{
 	HandlePlacePushButton(w, 2, ANIMCURSOR_DEMOLISH, 1, PlaceProc_DemolishArea);
+}
 static void TerraformClick_Lower(Window *w)
+{
-	HandlePlacePushButton(w, 3, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+	HandlePlacePushButton(w, 2, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LowerLand);
+}
 static void TerraformClick_Raise(Window *w)
+{
-	HandlePlacePushButton(w, 4, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
+	HandlePlacePushButton(w, 3, ANIMCURSOR_RAISELAND, 2, PlaceProc_RaiseLand);
+}
 static void TerraformClick_Level(Window *w)
+{
-	HandlePlacePushButton(w, 5, SPR_OPENTTD_BASE+69, 2, PlaceProc_LevelLand);
+	HandlePlacePushButton(w, 4, SPR_OPENTTD_BASE+69, 2, PlaceProc_LevelLand);
+}
 static void TerraformClick_BuyLand(Window *w)
+{
 	HandlePlacePushButton(w, 6, 4792, 1, PlaceProc_BuyLand);
+}
 static void TerraformClick_Trees(Window *w)
+{
-	if (HandlePlacePushButton(w, 8, 0, 1, PlaceProc_PlantTree)) ShowBuildTreesToolbar();
+	if (HandlePlacePushButton(w, 7, 0, 1, PlaceProc_PlantTree)) ShowBuildTreesToolbar();
+}
 static void TerraformClick_PlaceSign(Window *w)
+{
-	HandlePlacePushButton(w, 9, 722, 1, PlaceProc_Sign);
+	HandlePlacePushButton(w, 8, 722, 1, PlaceProc_Sign);
+}
 static OnButtonClick * const _terraform_button_proc[] = {
 	TerraformClick_Dynamite,
 	TerraformClick_Lower,
 	TerraformClick_Raise,
 	TerraformClick_Level,
 ,
 	TerraformClick_BuyLand,
 ,
 	TerraformClick_Trees,
 	TerraformClick_PlaceSign,
 };
 static void TerraformToolbWndProc(Window *w, WindowEvent *e)
+{
 	switch(e->event) {
 	case WE_PAINT:
 		DrawWindowWidgets(w);
 		break;
 	case WE_CLICK:
-		if (e->click.widget >= 2 && e->click.widget != 7) {
+		if (e->click.widget >= 2 && e->click.widget != 5) {
 			_terraform_button_proc[e->click.widget - 2](w);
+		}
 		break;
 	case WE_KEYPRESS:
+	{
 		int i;
 		for(i=0; i!=lengthof(_terraform_keycodes); i++)
 			if (e->keypress.keycode == _terraform_keycodes[i]) {
 				e->keypress.cont = false;
 				_terraform_button_proc[i](w);
 				break;
@@ @@ -176,40 +168,41 @@ static void TerraformToolbWndProc(Window @@
 		if (w != NULL) WP(w,def_d).close=true;
 		w = FindWindowById(WC_BUILD_DEPOT, 0);
 		if (w != NULL) WP(w,def_d).close=true;
 		break;
 	case WE_PLACE_PRESIZE: {
 	} break;
+	}
+}
 static const Widget _terraform_widgets[] = {
 { WWT_CLOSEBOX,     7,   0,  10,   0,  13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {  WWT_CAPTION,     7,  11, 157,   0,  13, STR_LANDSCAPING_TOOLBAR,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {  WWT_CAPTION,     7,  11, 135,   0,  13, STR_LANDSCAPING_TOOLBAR,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {    WWT_PANEL,     7,   0,  21,  14,  35,  695,										STR_018E_LOWER_A_CORNER_OF_LAND},
 {    WWT_PANEL,     7,  22,  43,  14,  35,  694,										STR_018F_RAISE_A_CORNER_OF_LAND},
 {    WWT_PANEL,     7,  44,  65,  14,  35,  SPR_OPENTTD_BASE+68,		STR_LEVEL_LAND_TOOLTIP},
 {    WWT_PANEL,     7,   0,  21,  14,  35,  703,										STR_018D_DEMOLISH_BUILDINGS_ETC},
 {    WWT_PANEL,     7,  22,  43,  14,  35,  695,										STR_018E_LOWER_A_CORNER_OF_LAND},
 {    WWT_PANEL,     7,  44,  65,  14,  35,  694,										STR_018F_RAISE_A_CORNER_OF_LAND},
 {    WWT_PANEL,     7,  66,  87,  14,  35,  SPR_OPENTTD_BASE+68,		STR_LEVEL_LAND_TOOLTIP},
 {    WWT_PANEL,     7,  88, 109,  14,  35, 4791,										STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {    WWT_PANEL,     7, 110, 113,  14,  35,  0x0,										STR_NULL},
 {    WWT_PANEL,     7, 114, 135,  14,  35,  742,										STR_0185_PLANT_TREES_PLACE_SIGNS},
 {    WWT_PANEL,     7, 136, 157,  14,  35, SPR_OPENTTD_BASE+70,			STR_0289_PLACE_SIGN},
 {    WWT_PANEL,     7,  66,  69,  14,  35,  0x0,										STR_NULL},
 {    WWT_PANEL,     7,  70,  91,  14,  35, 4791,										STR_0329_PURCHASE_LAND_FOR_FUTURE},
 {    WWT_PANEL,     7,  92, 113,  14,  35,  742,										STR_0185_PLANT_TREES_PLACE_SIGNS},
 {    WWT_PANEL,     7, 114, 135,  14,  35, SPR_OPENTTD_BASE+70,			STR_0289_PLACE_SIGN},
 {   WIDGETS_END},
 };
 static const WindowDesc _terraform_desc = {
--158, 22+36, 158, 36,
+-136, 22+36, 136, 36,
 	WC_SCEN_LAND_GEN,0,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_terraform_widgets,
 	TerraformToolbWndProc
 };
 void ShowTerraformToolbar()
+{
 	AllocateWindowDescFront(&_terraform_desc, 0);
+}

ttd.h

➞

Show inline comments

@@ @@ -410,30 +410,30 @@ enum { @@
 	WC_SUBSIDIES_LIST = 0x2C,
 	WC_GRAPH_LEGEND = 0x2D,
 	WC_DELIVERED_CARGO = 0x2E,
 	WC_PERFORMANCE_HISTORY = 0x2F,
 	WC_COMPANY_VALUE = 0x30,
 	WC_COMPANY_LEAGUE = 0x31,
 	WC_BUY_COMPANY = 0x32,
 	WC_PAYMENT_RATES = 0x33,
 	WC_SELECT_TUTORIAL = 0x34,
 	WC_ENGINE_PREVIEW = 0x35,
 	WC_MUSIC_WINDOW = 0x36,
 	WC_MUSIC_TRACK_SELECTION = 0x37,
 	WC_SCEN_LAND_GEN = 0x38,
+	WC_SCEN_LAND_GEN = 0x38, // also used for landscaping toolbar
 	WC_ASK_RESET_LANDSCAPE = 0x39,
 	WC_SCEN_TOWN_GEN = 0x3A,
 	WC_SCEN_INDUSTRY = 0x3B,
 	WC_SCEN_BUILD_ROAD = 0x3C,
-	WC_SCEN_BUILD_TREES = 0x3D,
+	WC_BUILD_TREES = 0x3D,
 	WC_SEND_NETWORK_MSG = 0x3E,
 	WC_DROPDOWN_MENU = 0x3F,
 	WC_BUILD_INDUSTRY = 0x40,
 	WC_GAME_OPTIONS = 0x41,
 	WC_NETWORK_WINDOW = 0x42,
 	WC_INDUSTRY_DIRECTORY = 0x43,
 	WC_MESSAGE_HISTORY = 0x44,
 	WC_CHEATS = 0x45,
 	WC_PERFORMANCE_DETAIL = 0x46,
 	WC_CONSOLE = 0x47,
 	WC_EXTRA_VIEW_PORT = 0x48,
 	WC_CLIENT_LIST = 0x49,

0 comments (0 inline, 0 general)