cpp/openttd-patchpack/source Changeset - r176:7d9100f64c27

Changeset - r176:7d9100f64c27

Parent rev.

Child rev.

[Not reviewed]

master

0 29 0

darkvater - 20 years ago 2004-09-07 21:48:09
darkvater@openttd.org

(svn r177) -Fix: padded out Widget code to solve warnings on C99 compiler (Tron)
-Fix: added WIDGETS_END macro for WWT_LAST which does this for all last widget-types

29 files changed with 1063 insertions and 1063 deletions:

aircraft_gui.c

airport_gui.c

bridge_gui.c

console.c

dock_gui.c

engine_gui.c

graph_gui.c

industry_gui.c

103

intro_gui.c

main_gui.c

134

misc_gui.c

music_gui.c

network_gui.c

news_gui.c

order_gui.c

player_gui.c

rail_gui.c

road_gui.c

roadveh_gui.c

settings_gui.c

ship_gui.c

smallmap_gui.c

station_gui.c

subsidy_gui.c

terraform_gui.c

town_gui.c

train_gui.c

widget.c

window.h

0 comments (0 inline, 0 general)

aircraft_gui.c

➞

Show inline comments

@@ @@ -158,14 +158,14 @@ static void NewAircraftWndProc(Window *w @@
+}
 static const Widget _new_aircraft_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A005_NEW_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   228,    14,   109, 0x401, STR_A025_AIRCRAFT_SELECTION_LIST},
 {  WWT_SCROLLBAR,    14,   229,   239,    14,   109, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   239,   110,   161, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,   119,   162,   173, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT},
 { WWT_PUSHTXTBTN,    14,   120,   239,   162,   173, STR_A037_RENAME, STR_A038_RENAME_AIRCRAFT_TYPE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A005_NEW_AIRCRAFT,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   228,    14,   109, 0x401,										STR_A025_AIRCRAFT_SELECTION_LIST},
 {  WWT_SCROLLBAR,    14,   229,   239,    14,   109, 0x0,											STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   239,   110,   161, 0x0,											STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   119,   162,   173, STR_A006_BUILD_AIRCRAFT,	STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT},
 { WWT_PUSHTXTBTN,    14,   120,   239,   162,   173, STR_A037_RENAME,					STR_A038_RENAME_AIRCRAFT_TYPE},
 {   WIDGETS_END},
 };
 static const WindowDesc _new_aircraft_desc = {
@@ @@ -272,12 +272,12 @@ static void AircraftRefitWndProc(Window @@
+}
 static const Widget _aircraft_refit_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A03C_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0, STR_A03E_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A03C_REFIT,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0,							STR_A03E_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0,							STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_A03D_REFIT_AIRCRAFT, STR_A03F_REFIT_AIRCRAFT_TO_CARRY},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _aircraft_refit_desc = {
@@ @@ -443,15 +443,15 @@ change_int: @@
 static const Widget _aircraft_details_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   349,     0,    13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   350,   389,     0,    13, STR_01AA_NAME, STR_A032_NAME_AIRCRAFT},
 {     WWT_IMGBTN,    14,     0,   389,    14,    55, 0x0},
 {     WWT_IMGBTN,    14,     0,   389,    56,   101, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,    10,   102,   107, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,   108,   113, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   389,   102,   113, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   349,     0,    13, STR_A00C_DETAILS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   350,   389,     0,    13, STR_01AA_NAME,			STR_A032_NAME_AIRCRAFT},
 {     WWT_IMGBTN,    14,     0,   389,    14,    55, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   389,    56,   101, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    10,   102,   107, STR_0188,					STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,   108,   113, STR_0189,					STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   389,   102,   113, 0x0,								STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _aircraft_details_desc = {
@@ @@ -481,17 +481,17 @@ static void ShowAircraftDetailsWindow(Ve @@
 static const Widget _aircraft_view_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_A00A, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0, 0},
 {          WWT_6,    14,     2,   229,    16,   101, 0x0, 0},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0, STR_A027_CURRENT_AIRCRAFT_ACTION},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB, STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AF, STR_A02A_SEND_AIRCRAFT_TO_HANGAR},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B4, STR_A03B_REFIT_AIRCRAFT_TO_CARRY},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2, STR_A028_SHOW_AIRCRAFT_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3, STR_A02B_SHOW_AIRCRAFT_DETAILS},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_A00A,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0,				STR_NULL},
 {          WWT_6,    14,     2,   229,    16,   101, 0x0,				STR_NULL},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0,				STR_A027_CURRENT_AIRCRAFT_ACTION},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB,			STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AF,			STR_A02A_SEND_AIRCRAFT_TO_HANGAR},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B4,			STR_A03B_REFIT_AIRCRAFT_TO_CARRY},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2,			STR_A028_SHOW_AIRCRAFT_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3,			STR_A02B_SHOW_AIRCRAFT_DETAILS},
 {   WIDGETS_END},
 };
 static void AircraftViewWndProc(Window *w, WindowEvent *e)
@@ @@ -740,7 +740,7 @@ static const Widget _aircraft_depot_widg @@
 {  WWT_SCROLLBAR,    14,   320,   330,    14,    61, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   164,    62,    73, STR_A003_NEW_AIRCRAFT, STR_A022_BUILD_NEW_AIRCRAFT},
 { WWT_PUSHTXTBTN,    14,   165,   330,    62,    73, STR_00E4_LOCATION, STR_A024_CENTER_MAIN_VIEW_ON_HANGAR},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
@@ @@ -1081,12 +1081,12 @@ static const Widget _player_aircraft_wid @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,						STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,							STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   169, 0x401,									STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   169, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   129,   170,   181, STR_A003_NEW_AIRCRAFT,	STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES},
 {      WWT_PANEL,    14,   130,   259,   170,   181, 0x0,										0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,   130,   259,   170,   181, 0x0,										STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _player_aircraft_desc = {
@@ @@ -1103,10 +1103,10 @@ static const Widget _other_player_aircra @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,						STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,							STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   169, 0x401,									STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   169, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _other_player_aircraft_desc = {

airport_gui.c

➞

Show inline comments

@@ @@ -113,7 +113,7 @@ static const Widget _air_toolbar_widgets @@
 {      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_LAST},
+{   WIDGETS_END},
 };
@@ @@ -196,7 +196,7 @@ static void BuildAirportPickerWndProc(Wi @@
 static const Widget _build_airport_picker_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,										STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   147,     0,    13, STR_3001_AIRPORT_SELECTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,     7,     0,   147,    14,   130, 0x0,													0},
+{      WWT_PANEL,     7,     0,   147,    14,   130, 0x0,													STR_NULL},
 {WWT_NODISTXTBTN,    14,     2,    73,    27,    38, STR_3059_SMALL,							STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
 {WWT_NODISTXTBTN,    14,    74,   145,    27,    38, STR_305A_LARGE,							STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
 {WWT_NODISTXTBTN,    14,     2,   145,    63,    74, STR_306B_HELIPORT,						STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
@@ @@ -204,7 +204,7 @@ static const Widget _build_airport_picke @@
 {WWT_NODISTXTBTN,    14,     2,   145,    51,    62, STR_305AB_LARGE,	  					STR_3058_SELECT_SIZE_TYPE_OF_AIRPORT},
 {   WWT_CLOSEBOX,    14,    14,    73,    88,    98, STR_02DB_OFF,								STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    74,   133,    88,    98, STR_02DA_ON,									STR_3064_HIGHLIGHT_COVERAGE_AREA},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_airport_desc = {

bridge_gui.c

➞

Show inline comments

@@ @@ -79,7 +79,7 @@ static const Widget _build_bridge_widget @@
 {    WWT_CAPTION,     7,    11,   199,     0,    13, STR_100D_SELECT_RAIL_BRIDGE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,     7,     0,   188,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
 {  WWT_SCROLLBAR,     7,   189,   199,    14,   101, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_bridge_desc = {
@@ @@ -96,7 +96,7 @@ static const Widget _build_road_bridge_w @@
 {    WWT_CAPTION,     7,    11,   199,     0,    13, STR_1803_SELECT_ROAD_BRIDGE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,     7,     0,   188,    14,   101, 0x401,												STR_101F_BRIDGE_SELECTION_CLICK},
 {  WWT_SCROLLBAR,     7,   189,   199,    14,   101, 0x0,													STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_road_bridge_desc = {

console.c

➞

Show inline comments

@@ @@ -31,7 +31,7 @@ static byte _icursor_counter; @@
 // ** console window ** //
 static void IConsoleWndProc(Window *w, WindowEvent *e);
-static const Widget _iconsole_window_widgets[] = {{WWT_LAST}};
+static const Widget _iconsole_window_widgets[] = {{WIDGETS_END}};
 static const WindowDesc _iconsole_window_desc = {
 , 0, 2, 2,
 	WC_CONSOLE,0,

dock_gui.c

➞

Show inline comments

@@ @@ -183,7 +183,7 @@ static const Widget _build_docks_toolb_w @@
 {      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_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_docks_toolbar_desc = {
@@ @@ -231,8 +231,8 @@ static void BuildDockStationWndProc(Wind @@
 static const Widget _build_dock_station_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,			STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   147,     0,    13, STR_3068_DOCK,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   147,    14,    45, 0x0,						0},
 {      WWT_LAST},
 {      WWT_PANEL,     7,     0,   147,    14,    45, 0x0,						STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_dock_station_desc = {
@@ @@ -295,10 +295,10 @@ static void BuildDocksDepotWndProc(Windo @@
 static const Widget _build_docks_depot_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,												STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   203,     0,    13, STR_3800_SHIP_DEPOT_ORIENTATION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,     7,     0,   203,    14,    85, 0x0,															0},
+{      WWT_PANEL,     7,     0,   203,    14,    85, 0x0,															STR_NULL},
 {      WWT_PANEL,    14,     3,   100,    17,    82, 0x0,															STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
 {      WWT_PANEL,    14,   103,   200,    17,    82, 0x0,															STR_3803_SELECT_SHIP_DEPOT_ORIENTATION},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_docks_depot_desc = {

engine_gui.c

➞

Show inline comments

@@ @@ -34,12 +34,12 @@ StringID GetEngineCategoryName(byte engi @@
+}
 static const Widget _engine_preview_widgets[] = {
-{    WWT_TEXTBTN,     5,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,     5,     0,    10,     0,    13, STR_00C5,			STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     5,    11,   299,     0,    13, STR_8100_MESSAGE_FROM_VEHICLE_MANUFACTURE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     5,     0,   299,    14,   191, 0x0},
 { WWT_PUSHTXTBTN,     5,    85,   144,   172,   183, STR_00C9_NO},
 { WWT_PUSHTXTBTN,     5,   155,   214,   172,   183, STR_00C8_YES},
 {      WWT_LAST},
 {     WWT_IMGBTN,     5,     0,   299,    14,   191, 0x0,						STR_NULL},
 { WWT_PUSHTXTBTN,     5,    85,   144,   172,   183, STR_00C9_NO,		STR_NULL},
 { WWT_PUSHTXTBTN,     5,   155,   214,   172,   183, STR_00C8_YES,	STR_NULL},
 {   WIDGETS_END},
 };
 typedef void DrawEngineProc(int x, int y, int engine, uint32 image_ormod);

graph_gui.c

➞

Show inline comments

@@ @@ -235,7 +235,7 @@ static void GraphLegendWndProc(Window *w @@
 static const Widget _graph_legend_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   249,    14,   113, 0x0},
+{     WWT_IMGBTN,    14,     0,   249,    14,   113, 0x0,STR_NULL},
 {     WWT_IMGBTN,    14,     2,   247,    16,    27, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,     2,   247,    28,    39, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,     2,   247,    40,    51, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
@@ @@ -244,7 +244,7 @@ static const Widget _graph_legend_widget @@
 {     WWT_IMGBTN,    14,     2,   247,    76,    87, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,     2,   247,    88,    99, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,     2,   247,   100,   111, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _graph_legend_desc = {
@@ @@ -342,11 +342,11 @@ static void OperatingProfitWndProc(Windo @@
+}
 static const Widget _operating_profit_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,												STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   525,     0,    13, STR_7025_OPERATING_PROFIT_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   173, 0x0},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY,										STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   173, 0x0,															STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _operating_profit_desc = {
@@ @@ -418,11 +418,11 @@ static void IncomeGraphWndProc(Window *w @@
+}
 static const Widget _income_graph_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   525,     0,    13, STR_7022_INCOME_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   141, 0x0},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY,					STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   141, 0x0,										STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _income_graph_desc = {
@@ @@ -492,11 +492,11 @@ static void DeliveredCargoGraphWndProc(W @@
+}
 static const Widget _delivered_cargo_graph_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,													STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   525,     0,    13, STR_7050_UNITS_OF_CARGO_DELIVERED, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   141, 0x0},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY,											STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   141, 0x0,																STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _delivered_cargo_graph_desc = {
@@ @@ -696,9 +696,9 @@ static void PerformanceRatingDetailWndPr @@
+}
 static const Widget _performance_rating_detail_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   266,     0,    13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   266,    14,    27, 0x0},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   266,     0,    13, STR_PERFORMANCE_DETAIL,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   266,    14,    27, 0x0,											STR_NULL},
 {     WWT_IMGBTN,    14,     0,   266,    28,    47, 0x0,STR_PERFORMANCE_DETAIL_VEHICLES_TIP},
 {     WWT_IMGBTN,    14,     0,   266,    48,    67, 0x0,STR_PERFORMANCE_DETAIL_STATIONS_TIP},
@@ @@ -719,7 +719,7 @@ static const Widget _performance_rating_ @@
 {     WWT_IMGBTN,    14,   167,   199,    14,    26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,   200,   232,    14,    26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
 {     WWT_IMGBTN,    14,   233,   265,    14,    26, 0x0,STR_704F_CLICK_HERE_TO_TOGGLE_COMPANY},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _performance_rating_detail_desc = {
@@ @@ -787,12 +787,12 @@ static void PerformanceHistoryWndProc(Wi @@
+}
 static const Widget _performance_history_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   475,     0,    13, STR_7051_COMPANY_PERFORMANCE_RATINGS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 { WWT_PUSHTXTBTN,    14,   476,   525,     0,    13, STR_PERFORMANCE_DETAIL_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   237, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,															STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   475,     0,    13, STR_7051_COMPANY_PERFORMANCE_RATINGS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY,													STR_704D_SHOW_KEY_TO_GRAPHS},
 { WWT_PUSHTXTBTN,    14,   476,   525,     0,    13, STR_PERFORMANCE_DETAIL_KEY,						STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   237, 0x0,																		STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _performance_history_desc = {
@@ @@ -862,11 +862,11 @@ static void CompanyValueGraphWndProc(Win @@
+}
 static const Widget _company_value_graph_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   525,     0,    13, STR_7052_COMPANY_VALUES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY, STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   237, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   525,     0,    13, STR_7052_COMPANY_VALUES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   526,   575,     0,    13, STR_704C_KEY,						STR_704D_SHOW_KEY_TO_GRAPHS},
 {     WWT_IMGBTN,    14,     0,   575,    14,   237, 0x0,											STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _company_value_graph_desc = {
@@ @@ -957,7 +957,7 @@ static void CargoPaymentRatesWndProc(Win @@
 static const Widget _cargo_payment_rates_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   567,     0,    13, STR_7061_CARGO_PAYMENT_RATES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,    14,     0,   567,    14,   141, 0x0,														0},
+{      WWT_PANEL,    14,     0,   567,    14,   141, 0x0,														STR_NULL},
 {      WWT_PANEL,    12,   493,   562,    24,    31, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {      WWT_PANEL,    12,   493,   562,    32,    39, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {      WWT_PANEL,    12,   493,   562,    40,    47, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
@@ @@ -970,7 +970,7 @@ static const Widget _cargo_payment_rates @@
 {      WWT_PANEL,    12,   493,   562,    96,   103, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {      WWT_PANEL,    12,   493,   562,   104,   111, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
 {      WWT_PANEL,    12,   493,   562,   112,   119, 0x0,														STR_7064_TOGGLE_GRAPH_FOR_CARGO},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _cargo_payment_rates_desc = {
@@ @@ -1068,10 +1068,10 @@ static void CompanyLeagueWndProc(Window @@
 static const Widget _company_league_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_7053_COMPANY_LEAGUE_TABLE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   399,    14,    96, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_7053_COMPANY_LEAGUE_TABLE,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   399,    14,    96, 0x0,														STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _company_league_desc = {

industry_gui.c

➞

Show inline comments

@@ @@ -51,131 +51,131 @@ static void BuildIndustryWndProc(Window @@
+}
 static const Widget _build_industry_land0_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,0},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_0242_SAWMILL,STR_0264_CONSTRUCT_SAWMILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0247_STEEL_MILL,STR_0269_CONSTRUCT_STEEL_MILL},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,														STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,				STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_0242_SAWMILL,							STR_0264_CONSTRUCT_SAWMILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,					STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,							STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0247_STEEL_MILL,						STR_0269_CONSTRUCT_STEEL_MILL},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land1_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,0},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,														STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,				STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024C_PAPER_MILL,						STR_026E_CONSTRUCT_PAPER_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,					STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_024E_PRINTING_WORKS,STR_0270_CONSTRUCT_PRINTING_WORKS},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_024E_PRINTING_WORKS,				STR_0270_CONSTRUCT_PRINTING_WORKS},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land2_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,0},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0250_LUMBER_MILL,STR_0273_CONSTRUCT_LUMBER_MILL_TO},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,														STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0250_LUMBER_MILL,					STR_0273_CONSTRUCT_LUMBER_MILL_TO},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0254_WATER_TOWER,STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,					STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,							STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0254_WATER_TOWER,					STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land3_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,0},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0258_CANDY_FACTORY,STR_027B_CONSTRUCT_CANDY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_025B_TOY_SHOP,STR_027E_CONSTRUCT_TOY_SHOP},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_025C_TOY_FACTORY,STR_027F_CONSTRUCT_TOY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_025E_FIZZY_DRINK_FACTORY,STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,											STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   115, 0x0,														STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0258_CANDY_FACTORY,				STR_027B_CONSTRUCT_CANDY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_025B_TOY_SHOP,							STR_027E_CONSTRUCT_TOY_SHOP},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_025C_TOY_FACTORY,					STR_027F_CONSTRUCT_TOY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_025E_FIZZY_DRINK_FACTORY,	STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land0_widgets_extra[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,     7,     0,   169,    14,   187, 0x0,0},
+{      WWT_PANEL,     7,     0,   169,    14,   187, 0x0,										STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_0242_SAWMILL,STR_0264_CONSTRUCT_SAWMILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0247_STEEL_MILL,STR_0269_CONSTRUCT_STEEL_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_0242_SAWMILL,			STR_0264_CONSTRUCT_SAWMILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,	STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,					STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0247_STEEL_MILL,		STR_0269_CONSTRUCT_STEEL_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    84,    95, STR_0240_COAL_MINE, STR_CONSTRUCT_COAL_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    97,    108, STR_0243_FOREST, STR_CONSTRUCT_FOREST_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    110,    121, STR_0245_OIL_RIG, STR_CONSTRUCT_OIL_RIG_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    123,    134, STR_0248_FARM, STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    136,    147, STR_024A_OIL_WELLS, STR_CONSTRUCT_OIL_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    149,    160, STR_0249_IRON_ORE_MINE, STR_CONSTRUCT_IRON_ORE_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    84,    95, STR_0240_COAL_MINE,		STR_CONSTRUCT_COAL_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    97,    108, STR_0243_FOREST,			STR_CONSTRUCT_FOREST_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    110,    121, STR_0245_OIL_RIG,		STR_CONSTRUCT_OIL_RIG_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    123,    134, STR_0248_FARM,						STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    136,    147, STR_024A_OIL_WELLS,			STR_CONSTRUCT_OIL_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    149,    160, STR_0249_IRON_ORE_MINE,	STR_CONSTRUCT_IRON_ORE_MINE_TIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const Widget _build_industry_land1_widgets_extra[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   174, 0x0,0},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   174, 0x0,											STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0241_POWER_STATION,	STR_0263_CONSTRUCT_POWER_STATION},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024C_PAPER_MILL,			STR_026E_CONSTRUCT_PAPER_MILL},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,		STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_024E_PRINTING_WORKS,STR_0270_CONSTRUCT_PRINTING_WORKS},
+{   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_024E_PRINTING_WORKS,	STR_0270_CONSTRUCT_PRINTING_WORKS},
 {   WWT_CLOSEBOX,    14,     2,   167,    81+3,    92+3, STR_0240_COAL_MINE,STR_CONSTRUCT_COAL_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,   105+3, STR_0243_FOREST,STR_CONSTRUCT_FOREST_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    107+3,  118+3, STR_0248_FARM,STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,  131+3, STR_024A_OIL_WELLS,STR_CONSTRUCT_OIL_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,  144+3, STR_024F_GOLD_MINE,STR_CONSTRUCT_GOLD_MINE_TIP},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     2,   167,    81+3,    92+3, STR_0240_COAL_MINE,	STR_CONSTRUCT_COAL_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,   105+3, STR_0243_FOREST,			STR_CONSTRUCT_FOREST_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    107+3,  118+3, STR_0248_FARM,				STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,  131+3, STR_024A_OIL_WELLS,	STR_CONSTRUCT_OIL_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,  144+3, STR_024F_GOLD_MINE,	STR_CONSTRUCT_GOLD_MINE_TIP},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land2_widgets_extra[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   200, 0x0,0},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,			STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   200, 0x0,										STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0250_LUMBER_MILL,STR_0273_CONSTRUCT_LUMBER_MILL_TO},
+{   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0250_LUMBER_MILL,	STR_0273_CONSTRUCT_LUMBER_MILL_TO},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_024D_FOOD_PROCESSING_PLANT,STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0254_WATER_TOWER,STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_0244_OIL_REFINERY,	STR_0266_CONSTRUCT_OIL_REFINERY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_0246_FACTORY,			STR_0268_CONSTRUCT_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68,    79, STR_0254_WATER_TOWER,	STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {   WWT_CLOSEBOX,    14,     2,   167,    81+3,    92+3, STR_024A_OIL_WELLS,STR_CONSTRUCT_OIL_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,    105+3, STR_0255_DIAMOND_MINE,STR_CONSTRUCT_DIAMOND_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    107+3,    118+3, STR_0256_COPPER_ORE_MINE,STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,    131+3, STR_0248_FARM,STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,    144+3, STR_0251_FRUIT_PLANTATION,STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,    105+3, STR_0255_DIAMOND_MINE,			STR_CONSTRUCT_DIAMOND_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    107+3,    118+3, STR_0256_COPPER_ORE_MINE,	STR_CONSTRUCT_COPPER_ORE_MINE_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,    131+3, STR_0248_FARM,		STR_CONSTRUCT_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,    144+3, STR_0251_FRUIT_PLANTATION,	STR_CONSTRUCT_FRUIT_PLANTATION_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    146+3,    157+3, STR_0252_RUBBER_PLANTATION,STR_CONSTRUCT_RUBBER_PLANTATION_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    159+3,    170+3, STR_0253_WATER_SUPPLY,STR_CONSTRUCT_WATER_SUPPLY_TIP},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     2,   167,    159+3,    170+3, STR_0253_WATER_SUPPLY,			STR_CONSTRUCT_WATER_SUPPLY_TIP},
 {   WIDGETS_END},
 };
 static const Widget _build_industry_land3_widgets_extra[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   187, 0x0,0},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_0314_FUND_NEW_INDUSTRY,			STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   169,    14,   187, 0x0,	STR_NULL},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0258_CANDY_FACTORY,STR_027B_CONSTRUCT_CANDY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_025B_TOY_SHOP,STR_027E_CONSTRUCT_TOY_SHOP},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_025C_TOY_FACTORY,STR_027F_CONSTRUCT_TOY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_025E_FIZZY_DRINK_FACTORY,STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    16,    27, STR_0258_CANDY_FACTORY,	STR_027B_CONSTRUCT_CANDY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    29,    40, STR_025B_TOY_SHOP,				STR_027E_CONSTRUCT_TOY_SHOP},
 {   WWT_CLOSEBOX,    14,     2,   167,    42,    53, STR_025C_TOY_FACTORY,		STR_027F_CONSTRUCT_TOY_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    55,    66, STR_025E_FIZZY_DRINK_FACTORY,		STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {   WWT_CLOSEBOX,    14,     2,   167,    68+3,    79+3, STR_0257_COTTON_CANDY_FOREST,STR_CONSTRUCT_COTTON_CANDY_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    81+3,    92+3, STR_0259_BATTERY_FARM,STR_CONSTRUCT_BATTERY_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,    105+3, STR_025A_COLA_WELLS,STR_CONSTRUCT_COLA_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    81+3,    92+3, STR_0259_BATTERY_FARM,				STR_CONSTRUCT_BATTERY_FARM_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    94+3,    105+3, STR_025A_COLA_WELLS,				STR_CONSTRUCT_COLA_WELLS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    107+3,    118+3, STR_025D_PLASTIC_FOUNTAINS,STR_CONSTRUCT_PLASTIC_FOUNTAINS_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,    131+3, STR_025F_BUBBLE_GENERATOR,STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,    144+3, STR_0260_TOFFEE_QUARRY,STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    146+3,    157+3, STR_0261_SUGAR_MINE,STR_CONSTRUCT_SUGAR_MINE_TIP},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     2,   167,    120+3,    131+3, STR_025F_BUBBLE_GENERATOR,	STR_CONSTRUCT_BUBBLE_GENERATOR_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    133+3,    144+3, STR_0260_TOFFEE_QUARRY,		STR_CONSTRUCT_TOFFEE_QUARRY_TIP},
 {   WWT_CLOSEBOX,    14,     2,   167,    146+3,    157+3, STR_0261_SUGAR_MINE,				STR_CONSTRUCT_SUGAR_MINE_TIP},
 {   WIDGETS_END},
 };
@@ @@ -334,16 +334,16 @@ static void IndustryViewWndProc(Window * @@
+}
 static const Widget _industry_view_widgets[] = {
 {    WWT_TEXTBTN,     9,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     9,    11,   259,     0,    13, STR_4801, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     9,     0,   259,    14,   105, 0x0},
 {          WWT_6,     9,     2,   257,    16,   103, 0x0},
 {     WWT_IMGBTN,     9,     0,   259,   106,   147, 0x0},
 { WWT_PUSHTXTBTN,     9,     0,   129,   148,   159, STR_00E4_LOCATION, STR_482C_CENTER_THE_MAIN_VIEW_ON},
 {     WWT_IMGBTN,     9,   130,   259,   148,   159, 0x0, 0},
 {    WWT_TEXTBTN,     9,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     9,    11,   259,     0,    13, STR_4801,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     9,     0,   259,    14,   105, 0x0,				STR_NULL},
 {          WWT_6,     9,     2,   257,    16,   103, 0x0,				STR_NULL},
 {     WWT_IMGBTN,     9,     0,   259,   106,   147, 0x0,				STR_NULL},
 { WWT_PUSHTXTBTN,     9,     0,   129,   148,   159, STR_00E4_LOCATION,	STR_482C_CENTER_THE_MAIN_VIEW_ON},
 {     WWT_IMGBTN,     9,   130,   259,   148,   159, 0x0,				STR_NULL},
 // Destroy Industry button costing money removed per request of dominik
 //{ WWT_PUSHTXTBTN,     9,   130,   259,   148,   159, STR_INDUSTRYDIR_DESTROY, STR_482C_DESTROY_INDUSTRY},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _industry_view_desc = {
@@ @@ -368,16 +368,16 @@ void ShowIndustryViewWindow(int industry @@
+}
 static const Widget _industry_directory_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   507,     0,    13, STR_INDUSTRYDIR_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    13,     0,   100,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   101,   200,    14,    25, STR_SORT_BY_TYPE, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   201,   300,    14,    25, STR_SORT_BY_PRODUCTION, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   301,   400,    14,    25, STR_SORT_BY_TRANSPORTED, STR_SORT_TIP},
 {      WWT_PANEL,    13,   401,   496,    14,    25, 0x0, 0},
 {     WWT_IMGBTN,    13,     0,   496,    26,   189, 0x0, STR_200A_TOWN_NAMES_CLICK_ON_NAME},
 {  WWT_SCROLLBAR,    13,   497,   507,    14,   189, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   507,     0,    13, STR_INDUSTRYDIR_CAPTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    13,     0,   100,    14,    25, STR_SORT_BY_NAME,				STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   101,   200,    14,    25, STR_SORT_BY_TYPE,				STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   201,   300,    14,    25, STR_SORT_BY_PRODUCTION,	STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    13,   301,   400,    14,    25, STR_SORT_BY_TRANSPORTED,	STR_SORT_TIP},
 {      WWT_PANEL,    13,   401,   496,    14,    25, 0x0,											STR_NULL},
 {     WWT_IMGBTN,    13,     0,   496,    26,   189, 0x0,	STR_200A_TOWN_NAMES_CLICK_ON_NAME},
 {  WWT_SCROLLBAR,    13,   497,   507,    14,   189, 0x0,	STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static byte _industry_sort[lengthof(_industries)];

intro_gui.c

➞

Show inline comments

@@ @@ -19,24 +19,24 @@ static void ShowSelectTutorialWindow() @@
 */
 static const Widget _select_game_widgets[] = {
 {    WWT_CAPTION,    13,     0,   335,     0,    13, STR_0307_OPENTTD},
 {     WWT_IMGBTN,    13,     0,   335,    14,   196, 0x0},
 { WWT_PUSHTXTBTN,    12,    10,   167,    22,    33, STR_0140_NEW_GAME, STR_02FB_START_A_NEW_GAME},
 { WWT_PUSHTXTBTN,    12,   168,   325,    22,    33, STR_0141_LOAD_GAME, STR_02FC_LOAD_A_SAVED_GAME_FROM},
 {    WWT_CAPTION,    13,     0,   335,     0,    13, STR_0307_OPENTTD,				STR_NULL},
 {     WWT_IMGBTN,    13,     0,   335,    14,   196, 0x0,											STR_NULL},
 { WWT_PUSHTXTBTN,    12,    10,   167,    22,    33, STR_0140_NEW_GAME,				STR_02FB_START_A_NEW_GAME},
 { WWT_PUSHTXTBTN,    12,   168,   325,    22,    33, STR_0141_LOAD_GAME,			STR_02FC_LOAD_A_SAVED_GAME_FROM},
 //{ WWT_PUSHTXTBTN,    12,    10,   167,   177,   188, STR_0142_TUTORIAL_DEMONSTRATION, STR_02FD_VIEW_DEMONSTRATIONS_TUTORIALS},
 { WWT_PUSHTXTBTN,    12,    10,   167,   177,   188, STR_CONFIG_PATCHES, STR_CONFIG_PATCHES_TIP},
 { WWT_PUSHTXTBTN,    12,    10,   167,    40,    51, STR_0220_CREATE_SCENARIO, STR_02FE_CREATE_A_CUSTOMIZED_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   136,   147, STR_SINGLE_PLAYER, STR_02FF_SELECT_SINGLE_PLAYER_GAME},
 { WWT_PUSHTXTBTN,    12,   168,   325,   136,   147, STR_MULTIPLAYER, STR_0300_SELECT_TWO_PLAYER_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   159,   170, STR_0148_GAME_OPTIONS, STR_0301_DISPLAY_GAME_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,   159,   170, STR_01FE_DIFFICULTY,STR_0302_DISPLAY_DIFFICULTY_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,    40,    51, STR_029A_PLAY_SCENARIO, STR_0303_START_A_NEW_GAME_USING},
 { WWT_PUSHTXTBTN,    12,   168,   325,   177,   188, STR_0304_QUIT, STR_0305_LEAVE_OPENTTD},
 {    WWT_PANEL_2,    12,    10,    85,    69,   122, 0x1312, STR_030E_SELECT_TEMPERATE_LANDSCAPE},
 {    WWT_PANEL_2,    12,    90,   165,    69,   122, 0x1314, STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
 {    WWT_PANEL_2,    12,   170,   245,    69,   122, 0x1316, STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
 {    WWT_PANEL_2,    12,   250,   325,    69,   122, 0x1318, STR_0311_SELECT_TOYLAND_LANDSCAPE},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    12,    10,   167,   177,   188, STR_CONFIG_PATCHES,			STR_CONFIG_PATCHES_TIP},
 { WWT_PUSHTXTBTN,    12,    10,   167,    40,    51, STR_0220_CREATE_SCENARIO,STR_02FE_CREATE_A_CUSTOMIZED_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   136,   147, STR_SINGLE_PLAYER,				STR_02FF_SELECT_SINGLE_PLAYER_GAME},
 { WWT_PUSHTXTBTN,    12,   168,   325,   136,   147, STR_MULTIPLAYER,					STR_0300_SELECT_TWO_PLAYER_GAME},
 { WWT_PUSHTXTBTN,    12,    10,   167,   159,   170, STR_0148_GAME_OPTIONS,		STR_0301_DISPLAY_GAME_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,   159,   170, STR_01FE_DIFFICULTY,			STR_0302_DISPLAY_DIFFICULTY_OPTIONS},
 { WWT_PUSHTXTBTN,    12,   168,   325,    40,    51, STR_029A_PLAY_SCENARIO,	STR_0303_START_A_NEW_GAME_USING},
 { WWT_PUSHTXTBTN,    12,   168,   325,   177,   188, STR_0304_QUIT,						STR_0305_LEAVE_OPENTTD},
 {    WWT_PANEL_2,    12,    10,    85,    69,   122, 0x1312,									STR_030E_SELECT_TEMPERATE_LANDSCAPE},
 {    WWT_PANEL_2,    12,    90,   165,    69,   122, 0x1314,									STR_030F_SELECT_SUB_ARCTIC_LANDSCAPE},
 {    WWT_PANEL_2,    12,   170,   245,    69,   122, 0x1316,									STR_0310_SELECT_SUB_TROPICAL_LANDSCAPE},
 {    WWT_PANEL_2,    12,   250,   325,    69,   122, 0x1318,									STR_0311_SELECT_TOYLAND_LANDSCAPE},
 {   WIDGETS_END},
 };
 static void SelectGameWndProc(Window *w, WindowEvent *e) {
@@ @@ -177,12 +177,12 @@ int32 CmdStartScenario(int x, int y, uin @@
 static const Widget _ask_abandon_game_widgets[] = {
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_00C7_QUIT},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES},
 {      WWT_LAST},
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5,			STR_NULL},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_00C7_QUIT,	STR_NULL},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0,						STR_NULL},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO,		STR_NULL},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES,	STR_NULL},
 {   WIDGETS_END},
 };
 static void AskAbandonGameWndProc(Window *w, WindowEvent *e) {
@@ @@ -235,12 +235,12 @@ void AskExitGame() @@
 static const Widget _ask_quit_game_widgets[] = {
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_0161_QUIT_GAME},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES},
 {      WWT_LAST},
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5,						STR_NULL},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_0161_QUIT_GAME,	STR_NULL},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0,									STR_NULL},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO,					STR_NULL},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES,				STR_NULL},
 {   WIDGETS_END},
 };
 static void AskQuitGameWndProc(Window *w, WindowEvent *e) {

main_gui.c

➞

Show inline comments

@@ @@ -437,14 +437,14 @@ static void MenuWndProc(Window *w, Windo @@
+}
 static Widget _menu_widgets[] = {
 {      WWT_PANEL,    14,     0,   159,     0, 65535,     0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,     0,   159,     0, 65535,     0,	STR_NULL},
 {   WIDGETS_END},
 };
 static Widget _player_menu_widgets[] = {
 {      WWT_PANEL,    14,     0,   240,     0,    81,     0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,     0,   240,     0,    81,     0,	STR_NULL},
 {   WIDGETS_END},
 };
@@ @@ -930,12 +930,12 @@ void ResetLandscape() @@
+}
 static const Widget _ask_reset_landscape_widgets[] = {
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_022C_RESET_LANDSCAPE},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES},
 {      WWT_LAST},
 {    WWT_TEXTBTN,     4,     0,    10,     0,    13, STR_00C5,									STR_NULL},
 {    WWT_CAPTION,     4,    11,   179,     0,    13, STR_022C_RESET_LANDSCAPE,	STR_NULL},
 {     WWT_IMGBTN,     4,     0,   179,    14,    91, 0x0,												STR_NULL},
 {    WWT_TEXTBTN,    12,    25,    84,    72,    83, STR_00C9_NO,								STR_NULL},
 {    WWT_TEXTBTN,    12,    95,   154,    72,    83, STR_00C8_YES,							STR_NULL},
 {   WIDGETS_END},
 };
 // Ask first to reset landscape or to make a random landscape
@@ @@ -1095,22 +1095,22 @@ void PlaceProc_Desert(uint tile) @@
+}
 static const Widget _scen_edit_land_gen_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   153,     0,    13, STR_0223_LAND_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     7,     0,   153,    14,    99, 0x0, 0},
 {     WWT_IMGBTN,    14,    22,    43,    14,    35, 0x2B6, STR_018F_RAISE_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,    14,    44,    65,    14,    35, 0x2B7, STR_018E_LOWER_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,    14,     0,    21,    14,    35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC},
 {    WWT_TEXTBTN,    14,   125,   135,    43,    54, STR_0224, STR_0228_INCREASE_SIZE_OF_LAND_AREA},
 {    WWT_TEXTBTN,    14,   125,   135,    56,    67, STR_0225, STR_0229_DECREASE_SIZE_OF_LAND_AREA},
 {    WWT_TEXTBTN,    14,    20,   135,    75,    86, STR_0226_RANDOM_LAND, STR_022A_GENERATE_RANDOM_LAND},
 {    WWT_TEXTBTN,    14,    20,   135,    88,    99, STR_0227_RESET_LAND, STR_022B_RESET_LANDSCAPE},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   153,     0,    13, STR_0223_LAND_GENERATION,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     7,     0,   153,    14,    99, 0x0,				STR_NULL},
 {     WWT_IMGBTN,    14,    22,    43,    14,    35, 0x2B6,			STR_018F_RAISE_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,    14,    44,    65,    14,    35, 0x2B7,			STR_018E_LOWER_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,    14,     0,    21,    14,    35, 0x2BF,			STR_018D_DEMOLISH_BUILDINGS_ETC},
 {    WWT_TEXTBTN,    14,   125,   135,    43,    54, STR_0224,	STR_0228_INCREASE_SIZE_OF_LAND_AREA},
 {    WWT_TEXTBTN,    14,   125,   135,    56,    67, STR_0225,	STR_0229_DECREASE_SIZE_OF_LAND_AREA},
 {    WWT_TEXTBTN,    14,    20,   135,    75,    86, STR_0226_RANDOM_LAND,		STR_022A_GENERATE_RANDOM_LAND},
 {    WWT_TEXTBTN,    14,    20,   135,    88,    99, STR_0227_RESET_LAND,			STR_022B_RESET_LANDSCAPE},
 {     WWT_IMGBTN,    14,    88,   109,    14,    35, 0xFF4, STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
 {     WWT_IMGBTN,    14,   110,   131,    14,    35, 0xFF5, STR_028D_PLACE_LIGHTHOUSE},
 {     WWT_IMGBTN,    14,   132,   153,    14,    35, 0xFF6, STR_028E_PLACE_TRANSMITTER},
 {     WWT_IMGBTN,    14,    66,    87,    14,    35, SPR_OPENTTD_BASE+68, STR_LEVEL_LAND_TOOLTIP},
 {      WWT_LAST},
 {     WWT_IMGBTN,    14,    88,   109,    14,    35, 0xFF4,			STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE},
 {     WWT_IMGBTN,    14,   110,   131,    14,    35, 0xFF5,			STR_028D_PLACE_LIGHTHOUSE},
 {     WWT_IMGBTN,    14,   132,   153,    14,    35, 0xFF6,			STR_028E_PLACE_TRANSMITTER},
 {     WWT_IMGBTN,    14,    66,    87,    14,    35, SPR_OPENTTD_BASE+68,			STR_LEVEL_LAND_TOOLTIP},
 {   WIDGETS_END},
 };
 static const int8 _multi_terraform_coords[][2] = {
@@ @@ -1264,16 +1264,16 @@ void PlaceProc_Town(uint tile) @@
 static const Widget _scen_edit_town_gen_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   159,     0,    13, STR_0233_TOWN_GENERATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     7,     0,   159,    14,    81, 0x0},
 {    WWT_TEXTBTN,    14,     2,   157,    16,    27, STR_0234_NEW_TOWN, STR_0235_CONSTRUCT_NEW_TOWN},
 {    WWT_TEXTBTN,    14,     2,   157,    29,    40, STR_023D_RANDOM_TOWN, STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION},
 {    WWT_TEXTBTN,    14,     2,   157,    42,    53, STR_MANY_RANDOM_TOWNS, STR_RANDOM_TOWNS_TIP},
 {    WWT_TEXTBTN,    14,     2,    53,    68,    79, STR_02A1_SMALL, STR_02A4_SELECT_TOWN_SIZE},
 {    WWT_TEXTBTN,    14,    54,   105,    68,    79, STR_02A2_MEDIUM, STR_02A4_SELECT_TOWN_SIZE},
 {    WWT_TEXTBTN,    14,   106,   157,    68,    79, STR_02A3_LARGE, STR_02A4_SELECT_TOWN_SIZE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,									STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   159,     0,    13, STR_0233_TOWN_GENERATION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     7,     0,   159,    14,    81, 0x0,												STR_NULL},
 {    WWT_TEXTBTN,    14,     2,   157,    16,    27, STR_0234_NEW_TOWN,					STR_0235_CONSTRUCT_NEW_TOWN},
 {    WWT_TEXTBTN,    14,     2,   157,    29,    40, STR_023D_RANDOM_TOWN,			STR_023E_BUILD_TOWN_IN_RANDOM_LOCATION},
 {    WWT_TEXTBTN,    14,     2,   157,    42,    53, STR_MANY_RANDOM_TOWNS,			STR_RANDOM_TOWNS_TIP},
 {    WWT_TEXTBTN,    14,     2,    53,    68,    79, STR_02A1_SMALL,						STR_02A4_SELECT_TOWN_SIZE},
 {    WWT_TEXTBTN,    14,    54,   105,    68,    79, STR_02A2_MEDIUM,						STR_02A4_SELECT_TOWN_SIZE},
 {    WWT_TEXTBTN,    14,   106,   157,    68,    79, STR_02A3_LARGE,						STR_02A4_SELECT_TOWN_SIZE},
 {   WIDGETS_END},
 };
 static void ScenEditTownGenWndProc(Window *w, WindowEvent *e)
@@ @@ -1349,91 +1349,91 @@ static void ToolbarScenGenTown(Window *w @@
 static const Widget _scenedit_industry_normal_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,								STR_NULL},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,	STR_NULL},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,											STR_NULL},
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,		STR_RANDOM_INDUSTRIES_TIP},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE, STR_0262_CONSTRUCT_COAL_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0242_SAWMILL, STR_0264_CONSTRUCT_SAWMILL},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST, STR_0265_PLANT_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0245_OIL_RIG, STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0247_STEEL_MILL, STR_0269_CONSTRUCT_STEEL_MILL},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0249_IRON_ORE_MINE, STR_026B_CONSTRUCT_IRON_ORE_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_024B_BANK, STR_026D_CONSTRUCT_BANK_CAN_ONLY},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE,			STR_0262_CONSTRUCT_COAL_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION,	STR_0263_CONSTRUCT_POWER_STATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0242_SAWMILL,				STR_0264_CONSTRUCT_SAWMILL},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST,					STR_0265_PLANT_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY,		STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0245_OIL_RIG,				STR_0267_CONSTRUCT_OIL_RIG_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0246_FACTORY,				STR_0268_CONSTRUCT_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0247_STEEL_MILL,			STR_0269_CONSTRUCT_STEEL_MILL},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM,						STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0249_IRON_ORE_MINE,	STR_026B_CONSTRUCT_IRON_ORE_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS,			STR_026C_CONSTRUCT_OIL_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_024B_BANK,						STR_026D_CONSTRUCT_BANK_CAN_ONLY},
 {   WIDGETS_END},
 };
 static const Widget _scenedit_industry_hilly_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,								STR_NULL},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,	STR_NULL},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,											STR_NULL},
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,		STR_RANDOM_INDUSTRIES_TIP},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE, STR_0262_CONSTRUCT_COAL_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION, STR_0263_CONSTRUCT_POWER_STATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_024C_PAPER_MILL, STR_026E_CONSTRUCT_PAPER_MILL},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST, STR_0265_PLANT_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_024E_PRINTING_WORKS, STR_0270_CONSTRUCT_PRINTING_WORKS},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_024F_GOLD_MINE, STR_0271_CONSTRUCT_GOLD_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024B_BANK, STR_0272_CONSTRUCT_BANK_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0240_COAL_MINE,			STR_0262_CONSTRUCT_COAL_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0241_POWER_STATION,	STR_0263_CONSTRUCT_POWER_STATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_024C_PAPER_MILL,			STR_026E_CONSTRUCT_PAPER_MILL},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0243_FOREST,					STR_0265_PLANT_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_0244_OIL_REFINERY,		STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_024D_FOOD_PROCESSING_PLANT,	STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_024E_PRINTING_WORKS,	STR_0270_CONSTRUCT_PRINTING_WORKS},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_024F_GOLD_MINE,			STR_0271_CONSTRUCT_GOLD_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0248_FARM,						STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024B_BANK,						STR_0272_CONSTRUCT_BANK_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024A_OIL_WELLS,			STR_026C_CONSTRUCT_OIL_WELLS},
 {   WIDGETS_END},
 };
 static const Widget _scenedit_industry_desert_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,									STR_NULL},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,		STR_NULL},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,												STR_NULL},
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,			STR_RANDOM_INDUSTRIES_TIP},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0250_LUMBER_MILL, STR_0273_CONSTRUCT_LUMBER_MILL_TO},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0251_FRUIT_PLANTATION, STR_0274_PLANT_FRUIT_PLANTATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0252_RUBBER_PLANTATION, STR_0275_PLANT_RUBBER_PLANTATION},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0244_OIL_REFINERY, STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_024D_FOOD_PROCESSING_PLANT, STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0246_FACTORY, STR_0268_CONSTRUCT_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0253_WATER_SUPPLY, STR_0276_CONSTRUCT_WATER_SUPPLY},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0248_FARM, STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0254_WATER_TOWER, STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024A_OIL_WELLS, STR_026C_CONSTRUCT_OIL_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024B_BANK, STR_0272_CONSTRUCT_BANK_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_0255_DIAMOND_MINE, STR_0278_CONSTRUCT_DIAMOND_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   198,   209, STR_0256_COPPER_ORE_MINE, STR_0279_CONSTRUCT_COPPER_ORE_MINE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0250_LUMBER_MILL,			STR_0273_CONSTRUCT_LUMBER_MILL_TO},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0251_FRUIT_PLANTATION,	STR_0274_PLANT_FRUIT_PLANTATION},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0252_RUBBER_PLANTATION,STR_0275_PLANT_RUBBER_PLANTATION},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_0244_OIL_REFINERY,			STR_0266_CONSTRUCT_OIL_REFINERY},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_024D_FOOD_PROCESSING_PLANT,	STR_026F_CONSTRUCT_FOOD_PROCESSING},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_0246_FACTORY,					STR_0268_CONSTRUCT_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_0253_WATER_SUPPLY,			STR_0276_CONSTRUCT_WATER_SUPPLY},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_0248_FARM,							STR_026A_CONSTRUCT_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_0254_WATER_TOWER,			STR_0277_CONSTRUCT_WATER_TOWER_CAN},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_024A_OIL_WELLS,				STR_026C_CONSTRUCT_OIL_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_024B_BANK,							STR_0272_CONSTRUCT_BANK_CAN_ONLY},
 {    WWT_TEXTBTN,    14,     2,   167,   185,   196, STR_0255_DIAMOND_MINE,			STR_0278_CONSTRUCT_DIAMOND_MINE},
 {    WWT_TEXTBTN,    14,     2,   167,   198,   209, STR_0256_COPPER_ORE_MINE,	STR_0279_CONSTRUCT_COPPER_ORE_MINE},
 {   WIDGETS_END},
 };
 static const Widget _scenedit_industry_candy_widgets[] = {
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0},
 {    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,										STR_NULL},
 {    WWT_CAPTION,     7,    11,   169,     0,    13, STR_023F_INDUSTRY_GENERATION,STR_NULL},
 {     WWT_IMGBTN,     7,     0,   169,    14,   224, 0x0,													STR_NULL},
-{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES, STR_RANDOM_INDUSTRIES_TIP},
+{    WWT_TEXTBTN,    14,     2,   167,    16,    27, STR_MANY_RANDOM_INDUSTRIES,	STR_RANDOM_INDUSTRIES_TIP},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0257_COTTON_CANDY_FOREST, STR_027A_PLANT_COTTON_CANDY_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0258_CANDY_FACTORY, STR_027B_CONSTRUCT_CANDY_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0259_BATTERY_FARM, STR_027C_CONSTRUCT_BATTERY_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_025A_COLA_WELLS, STR_027D_CONSTRUCT_COLA_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_025B_TOY_SHOP, STR_027E_CONSTRUCT_TOY_SHOP},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_025C_TOY_FACTORY, STR_027F_CONSTRUCT_TOY_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_025D_PLASTIC_FOUNTAINS, STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_025E_FIZZY_DRINK_FACTORY, STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_025F_BUBBLE_GENERATOR, STR_0282_CONSTRUCT_BUBBLE_GENERATOR},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0260_TOFFEE_QUARRY, STR_0283_CONSTRUCT_TOFFEE_QUARRY},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_0261_SUGAR_MINE, STR_0284_CONSTRUCT_SUGAR_MINE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     2,   167,    42,    53, STR_0257_COTTON_CANDY_FOREST,STR_027A_PLANT_COTTON_CANDY_FOREST},
 {    WWT_TEXTBTN,    14,     2,   167,    55,    66, STR_0258_CANDY_FACTORY,			STR_027B_CONSTRUCT_CANDY_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,    68,    79, STR_0259_BATTERY_FARM,				STR_027C_CONSTRUCT_BATTERY_FARM},
 {    WWT_TEXTBTN,    14,     2,   167,    81,    92, STR_025A_COLA_WELLS,					STR_027D_CONSTRUCT_COLA_WELLS},
 {    WWT_TEXTBTN,    14,     2,   167,    94,   105, STR_025B_TOY_SHOP,						STR_027E_CONSTRUCT_TOY_SHOP},
 {    WWT_TEXTBTN,    14,     2,   167,   107,   118, STR_025C_TOY_FACTORY,				STR_027F_CONSTRUCT_TOY_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   120,   131, STR_025D_PLASTIC_FOUNTAINS,	STR_0280_CONSTRUCT_PLASTIC_FOUNTAINS},
 {    WWT_TEXTBTN,    14,     2,   167,   133,   144, STR_025E_FIZZY_DRINK_FACTORY,STR_0281_CONSTRUCT_FIZZY_DRINK_FACTORY},
 {    WWT_TEXTBTN,    14,     2,   167,   146,   157, STR_025F_BUBBLE_GENERATOR,		STR_0282_CONSTRUCT_BUBBLE_GENERATOR},
 {    WWT_TEXTBTN,    14,     2,   167,   159,   170, STR_0260_TOFFEE_QUARRY,			STR_0283_CONSTRUCT_TOFFEE_QUARRY},
 {    WWT_TEXTBTN,    14,     2,   167,   172,   183, STR_0261_SUGAR_MINE,					STR_0284_CONSTRUCT_SUGAR_MINE},
 {   WIDGETS_END},
 };
 int _industry_type_to_place;
@@ @@ -1770,7 +1770,7 @@ static const Widget _toolb_normal_widget @@
 {      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},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _toolb_normal_desc = {
@@ @@ -1791,40 +1791,40 @@ static const WindowDesc _toolb_intro_des @@
 static const Widget _toolb_scen_widgets[] = {
 {      WWT_PANEL,    14,     0,    21,     0,    21, 0x2D6, STR_0171_PAUSE_GAME},
 {      WWT_PANEL,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57, STR_FAST_FORWARD},
 {      WWT_PANEL,    14,    44,    65,     0,    21, 0x2EF, STR_0187_OPTIONS},
 {    WWT_PANEL_2,    14,    66,    87,     0,    21, 0x2D4, STR_0297_SAVE_SCENARIO_LOAD_SCENARIO	},
 {      WWT_PANEL,    14,     0,    21,     0,    21, 0x2D6,				STR_0171_PAUSE_GAME},
 {      WWT_PANEL,    14,    22,    43,     0,    21, SPR_OPENTTD_BASE + 57,	STR_FAST_FORWARD},
 {      WWT_PANEL,    14,    44,    65,     0,    21, 0x2EF,				STR_0187_OPTIONS},
 {    WWT_PANEL_2,    14,    66,    87,     0,    21, 0x2D4,				STR_0297_SAVE_SCENARIO_LOAD_SCENARIO},
 {      WWT_PANEL,    14,    96,   225,     0,    21, 0x0},
+{      WWT_PANEL,    14,    96,   225,     0,    21, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,   233,   362,     0,    21, 0x0},
 {   WWT_CLOSEBOX,    14,   236,   246,     5,    16, STR_0225, STR_029E_MOVE_THE_STARTING_DATE},
 {   WWT_CLOSEBOX,    14,   347,   357,     5,    16, STR_0224, STR_029F_MOVE_THE_STARTING_DATE},
 {      WWT_PANEL,    14,   233,   362,     0,    21, 0x0,					STR_NULL},
 {   WWT_CLOSEBOX,    14,   236,   246,     5,    16, STR_0225,		STR_029E_MOVE_THE_STARTING_DATE},
 {   WWT_CLOSEBOX,    14,   347,   357,     5,    16, STR_0224,		STR_029F_MOVE_THE_STARTING_DATE},
-{      WWT_PANEL,    14,   371,   392,     0,    21, 0x2C4, STR_0175_DISPLAY_MAP_TOWN_DIRECTORY},
+{      WWT_PANEL,    14,   371,   392,     0,    21, 0x2C4,				STR_0175_DISPLAY_MAP_TOWN_DIRECTORY},
 {      WWT_PANEL,    14,   400,   421,     0,    21, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
 {      WWT_PANEL,    14,   422,   443,     0,    21, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
 {      WWT_PANEL,    14,   400,   421,     0,    21, 0x2DF,				STR_017F_ZOOM_THE_VIEW_IN},
 {      WWT_PANEL,    14,   422,   443,     0,    21, 0x2E0,				STR_0180_ZOOM_THE_VIEW_OUT},
 {      WWT_PANEL,    14,   452,   473,     0,    21, 0xFF3, STR_022E_LANDSCAPE_GENERATION},
 {      WWT_PANEL,    14,   474,   495,     0,    21, 0xFED, STR_022F_TOWN_GENERATION},
 {      WWT_PANEL,    14,   496,   517,     0,    21, 0x2E5, STR_0230_INDUSTRY_GENERATION},
 {      WWT_PANEL,    14,   518,   539,     0,    21, 0x2D8, STR_0231_ROAD_CONSTRUCTION},
 {      WWT_PANEL,    14,   540,   561,     0,    21, 0x2E6, STR_0288_PLANT_TREES},
 {      WWT_PANEL,    14,   562,   583,     0,    21, 0xFF2, STR_0289_PLACE_SIGN},
 {      WWT_PANEL,    14,   452,   473,     0,    21, 0xFF3,				STR_022E_LANDSCAPE_GENERATION},
 {      WWT_PANEL,    14,   474,   495,     0,    21, 0xFED,				STR_022F_TOWN_GENERATION},
 {      WWT_PANEL,    14,   496,   517,     0,    21, 0x2E5,				STR_0230_INDUSTRY_GENERATION},
 {      WWT_PANEL,    14,   518,   539,     0,    21, 0x2D8,				STR_0231_ROAD_CONSTRUCTION},
 {      WWT_PANEL,    14,   540,   561,     0,    21, 0x2E6,				STR_0288_PLANT_TREES},
 {      WWT_PANEL,    14,   562,   583,     0,    21, 0xFF2,				STR_0289_PLACE_SIGN},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_PANEL,    14,   596,   617,     0,    21, 0x2C9,STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3, STR_0186_LAND_BLOCK_INFORMATION},
 {      WWT_LAST},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,   596,   617,     0,    21, 0x2C9,				STR_01D4_SHOW_SOUND_MUSIC_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,   618,   639,     0,    21, 0x2D3,				STR_0186_LAND_BLOCK_INFORMATION},
 {   WIDGETS_END},
 };
 static ToolbarButtonProc* const _scen_toolbar_button_procs[] = {
@@ @@ -2053,10 +2053,10 @@ static void ScrollMainViewport(int x, in @@
 static const Widget _main_status_widgets[] = {
-{     WWT_IMGBTN,    14,     0,   139,     0,    11, 0x0, 0},
+{     WWT_IMGBTN,    14,     0,   139,     0,    11, 0x0,	STR_NULL},
 { WWT_PUSHIMGBTN,    14,   140,   499,     0,    11, 0x0, STR_02B7_SHOW_LAST_MESSAGE_OR_NEWS},
 { WWT_PUSHIMGBTN,    14,   500,   639,     0,    11, 0x0, 0},
 {      WWT_LAST},
 { WWT_PUSHIMGBTN,    14,   500,   639,     0,    11, 0x0, STR_NULL},
 {   WIDGETS_END},
 };
 static WindowDesc _main_status_desc = {

misc_gui.c

➞

Show inline comments

@@ @@ -111,10 +111,10 @@ static void LandInfoWndProc(Window *w, W @@
+}
 static const Widget _land_info_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   279,     0,    13, STR_01A3_LAND_AREA_INFORMATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   279,    14,    92, 0x0, 0},
 {      WWT_LAST},
 {     WWT_IMGBTN,    14,     0,   279,    14,    92, 0x0,				STR_NULL},
 {    WIDGETS_END},
 };
 static const WindowDesc _land_info_desc = {
@@ @@ -205,10 +205,10 @@ static void AboutWindowProc(Window *w, W @@
+}
 static const Widget _about_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_015B_OPENTTD},
 {      WWT_PANEL,    14,     0,   399,    14,   271, 0x0},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,					STR_NULL},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_015B_OPENTTD,	STR_NULL},
 {      WWT_PANEL,    14,     0,   399,    14,   271, 0x0,								STR_NULL},
 {    WIDGETS_END},
 };
 static const WindowDesc _about_desc = {
@@ @@ -323,7 +323,7 @@ static void BuildTreesWndProc(Window *w, @@
 static const Widget _build_trees_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,   170, 0x0,							0},
+{      WWT_PANEL,     7,     0,   142,    14,   170, 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},
@@ @@ -337,7 +337,7 @@ static const Widget _build_trees_widgets @@
 {      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_LAST},
+{    WIDGETS_END},
 };
 static const WindowDesc _build_trees_desc = {
@@ @@ -351,7 +351,7 @@ static const WindowDesc _build_trees_des @@
 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,							0},
+{      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},
@@ @@ -364,9 +364,9 @@ static const Widget _build_trees_scen_wi @@
 {      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},
 {      WWT_LAST},
 {		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 = {
@@ @@ -395,17 +395,17 @@ static uint _errmsg_duration; @@
 static const Widget _errmsg_widgets[] = {
 {   WWT_CLOSEBOX,     4,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     4,    11,   239,     0,    13, STR_00B2_MESSAGE},
 {      WWT_PANEL,     4,     0,   239,    14,    45, 0x0},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     4,     0,    10,     0,    13, STR_00C5,					STR_NULL},
 {    WWT_CAPTION,     4,    11,   239,     0,    13, STR_00B2_MESSAGE,	STR_NULL},
 {      WWT_PANEL,     4,     0,   239,    14,    45, 0x0,								STR_NULL},
 {    WIDGETS_END},
 };
 static const Widget _errmsg_face_widgets[] = {
 {   WWT_CLOSEBOX,     4,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     4,    11,   333,     0,    13, STR_00B3_MESSAGE_FROM},
 {      WWT_PANEL,     4,     0,   333,    14,   136, 0x0},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     4,     0,    10,     0,    13, STR_00C5,							STR_NULL},
 {    WWT_CAPTION,     4,    11,   333,     0,    13, STR_00B3_MESSAGE_FROM,	STR_NULL},
 {      WWT_PANEL,     4,     0,   333,    14,   136, 0x0,										STR_NULL},
 {   WIDGETS_END},
 };
 static void ErrmsgWndProc(Window *w, WindowEvent *e)
@@ @@ -556,8 +556,8 @@ void ShowCostOrIncomeAnimation(int x, in @@
+}
 static Widget _tooltips_widgets[] = {
 {      WWT_PANEL,    14,     0,   199,     0,    31, 0x0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,     0,   199,     0,    31, 0x0, STR_NULL},
 {   WIDGETS_END},
 };
@@ @@ -840,13 +840,13 @@ press_ok:; @@
+}
 static const Widget _query_string_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,    14,    11,   259,     0,    13, STR_012D},
 {     WWT_IMGBTN,    14,     0,   259,    14,    29, 0x0},
 {    WWT_TEXTBTN,    14,     0,   129,    30,    41, STR_012E_CANCEL},
 {    WWT_TEXTBTN,    14,   130,   259,    30,    41, STR_012F_OK},
 {     WWT_IMGBTN,    14,     2,   257,    16,    27, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_NULL},
 {    WWT_CAPTION,    14,    11,   259,     0,    13, STR_012D,				STR_NULL},
 {     WWT_IMGBTN,    14,     0,   259,    14,    29, 0x0,							STR_NULL},
 {    WWT_TEXTBTN,    14,     0,   129,    30,    41, STR_012E_CANCEL,	STR_NULL},
 {    WWT_TEXTBTN,    14,   130,   259,    30,    41, STR_012F_OK,			STR_NULL},
 {     WWT_IMGBTN,    14,     2,   257,    16,    27, 0x0,							STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _query_string_desc = {
@@ @@ -892,59 +892,59 @@ void ShowQueryString(StringID str, Strin @@
+}
 static const Widget _load_dialog_1_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_4001_LOAD_GAME, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0},
 {     WWT_IMGBTN,    14,     0,   256,    48,   293, 0x0},
 {          WWT_6,    14,     2,   243,    50,   291, 0x0, STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   293, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_4001_LOAD_GAME,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME,	STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,	STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   256,    48,   293, 0x0,								STR_NULL},
 {          WWT_6,    14,     2,   243,    50,   291, 0x0,								STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   293, 0x0,								STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static const Widget _load_dialog_2_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_0298_LOAD_SCENARIO, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0},
 {     WWT_IMGBTN,    14,     0,   256,    48,   293, 0x0},
 {          WWT_6,    14,     2,   243,    50,   291, 0x0, STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   293, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_0298_LOAD_SCENARIO,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME,	STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,	STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   256,    48,   293, 0x0,								STR_NULL},
 {          WWT_6,    14,     2,   243,    50,   291, 0x0,								STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   293, 0x0,								STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static const Widget _save_dialog_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_4000_SAVE_GAME, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0},
 {     WWT_IMGBTN,    14,     0,   256,    48,   291, 0x0},
 {          WWT_6,    14,     2,   243,    50,   289, 0x0, STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   291, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   256,   292,   307, 0x0},
 {     WWT_IMGBTN,    14,     2,   254,   294,   305, 0x0, STR_400B_CURRENTLY_SELECTED_NAME},
 { WWT_PUSHTXTBTN,    14,     0,   127,   308,   319, STR_4003_DELETE, STR_400C_DELETE_THE_CURRENTLY_SELECTED},
 { WWT_PUSHTXTBTN,    14,   128,   256,   308,   319, STR_4002_SAVE, STR_400D_SAVE_THE_CURRENT_GAME_USING},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,						STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_4000_SAVE_GAME,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME,		STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,		STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0,									STR_NULL},
 {     WWT_IMGBTN,    14,     0,   256,    48,   291, 0x0,									STR_NULL},
 {          WWT_6,    14,     2,   243,    50,   289, 0x0,									STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   291, 0x0,									STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   256,   292,   307, 0x0,									STR_NULL},
 {     WWT_IMGBTN,    14,     2,   254,   294,   305, 0x0,									STR_400B_CURRENTLY_SELECTED_NAME},
 { WWT_PUSHTXTBTN,    14,     0,   127,   308,   319, STR_4003_DELETE,			STR_400C_DELETE_THE_CURRENTLY_SELECTED},
 { WWT_PUSHTXTBTN,    14,   128,   256,   308,   319, STR_4002_SAVE,				STR_400D_SAVE_THE_CURRENT_GAME_USING},
 {   WIDGETS_END},
 };
 static const Widget _save_dialog_scen_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   256,     0,    13, STR_0299_SAVE_SCENARIO, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0},
 {     WWT_IMGBTN,    14,     0,   256,    48,   291, 0x0},
 {          WWT_6,    14,     2,   243,    50,   289, 0x0, STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   291, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   256,   292,   307, 0x0},
 {     WWT_IMGBTN,    14,     2,   254,   294,   305, 0x0, STR_400B_CURRENTLY_SELECTED_NAME},
 { WWT_PUSHTXTBTN,    14,     0,   127,   308,   319, STR_4003_DELETE, STR_400C_DELETE_THE_CURRENTLY_SELECTED},
 { WWT_PUSHTXTBTN,    14,   128,   256,   308,   319, STR_4002_SAVE, STR_400D_SAVE_THE_CURRENT_GAME_USING},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,     0,   127,    14,    25, STR_SORT_BY_NAME,	STR_SORT_TIP},
 { WWT_PUSHTXTBTN,    14,   128,   256,    14,    25, STR_SORT_BY_DATE,	STR_SORT_TIP},
 {     WWT_IMGBTN,    14,     0,   256,    26,    47, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   256,    48,   291, 0x0,								STR_NULL},
 {          WWT_6,    14,     2,   243,    50,   289, 0x0,								STR_400A_LIST_OF_DRIVES_DIRECTORIES},
 {  WWT_SCROLLBAR,    14,   246,   256,    48,   291, 0x0,								STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   256,   292,   307, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     2,   254,   294,   305, 0x0,								STR_400B_CURRENTLY_SELECTED_NAME},
 { WWT_PUSHTXTBTN,    14,     0,   127,   308,   319, STR_4003_DELETE,		STR_400C_DELETE_THE_CURRENTLY_SELECTED},
 { WWT_PUSHTXTBTN,    14,   128,   256,   308,   319, STR_4002_SAVE,			STR_400D_SAVE_THE_CURRENT_GAME_USING},
 {   WIDGETS_END},
 };
@@ @@ -1204,14 +1204,14 @@ void RedrawAutosave() @@
+}
 static const Widget _select_scenario_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   256,     0,    13, STR_400E_SELECT_NEW_GAME_TYPE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,     7,     0,   127,    14,    25, STR_SORT_BY_NAME, STR_SORT_TIP},
 { WWT_PUSHTXTBTN,     7,   128,   256,    14,    25, STR_SORT_BY_DATE, STR_SORT_TIP},
 {     WWT_IMGBTN,     7,     0,   245,    26,   319, 0x0},
 {          WWT_6,     7,     2,   243,    28,   317, 0x0, STR_400F_SELECT_SCENARIO_GREEN_PRE},
 {  WWT_SCROLLBAR,     7,   246,   256,    26,   319, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,     7,     0,   127,    14,    25, STR_SORT_BY_NAME,	STR_SORT_TIP},
 { WWT_PUSHTXTBTN,     7,   128,   256,    14,    25, STR_SORT_BY_DATE,	STR_SORT_TIP},
 {     WWT_IMGBTN,     7,     0,   245,    26,   319, 0x0,								STR_NULL},
 {          WWT_6,     7,     2,   243,    28,   317, 0x0,								STR_400F_SELECT_SCENARIO_GREEN_PRE},
 {  WWT_SCROLLBAR,     7,   246,   256,    26,   319, 0x0,								STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static void SelectScenarioWndProc(Window *w, WindowEvent *e) {
@@ @@ -1444,12 +1444,11 @@ static const CheatEntry _cheats_ui[] = { @@
 static const Widget _cheat_widgets[] = {
-{   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,			STR_018B_CLOSE_WINDOW},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   399,     0,    13, STR_CHEATS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   399,    14,   147, 0x0},
 {     WWT_IMGBTN,    14,     0,   399,    14,   147, 0x0, STR_CHEATS_TIP},
 {      WWT_LAST},
 {      WWT_PANEL,    14,     0,   399,    14,   147, 0x0,					STR_NULL},
 {     WWT_IMGBTN,    14,     0,   399,    14,   147, 0x0,					STR_CHEATS_TIP},
 {   WIDGETS_END},
 };
 extern void DrawPlayerIcon(int p, int x, int y);

music_gui.c

➞

Show inline comments

@@ @@ -247,20 +247,20 @@ static void MusicTrackSelectionWndProc(W @@
+}
 static const Widget _music_track_selection_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   431,     0,    13, STR_01EB_MUSIC_PROGRAM_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   431,    14,   217, 0x0, 0},
 {     WWT_IMGBTN,    14,     2,   181,    22,   215, 0x0,STR_01FA_CLICK_ON_MUSIC_TRACK_TO},
 {     WWT_IMGBTN,    14,   250,   429,    22,   215, 0x0,STR_01F2_CURRENT_PROGRAM_OF_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    44,    51, 0x0,STR_01F3_SELECT_ALL_TRACKS_PROGRAM},
 { WWT_PUSHIMGBTN,    14,   186,   245,    52,    59, 0x0,STR_01F4_SELECT_OLD_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    60,    67, 0x0,STR_01F5_SELECT_NEW_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    68,    75, 0x0,STR_0330_SELECT_EZY_STREET_STYLE},
 { WWT_PUSHIMGBTN,    14,   186,   245,    76,    83, 0x0,STR_01F6_SELECT_CUSTOM_1_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,    84,    91, 0x0,STR_01F7_SELECT_CUSTOM_2_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,   108,   115, 0x0,STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1},
 { WWT_PUSHIMGBTN,    14,   186,   245,   124,   131, 0x0,STR_01F9_SAVE_MUSIC_SETTINGS_TO},
 {      WWT_LAST},
 {     WWT_IMGBTN,    14,     0,   431,    14,   217, 0x0,			STR_NULL},
 {     WWT_IMGBTN,    14,     2,   181,    22,   215, 0x0,			STR_01FA_CLICK_ON_MUSIC_TRACK_TO},
 {     WWT_IMGBTN,    14,   250,   429,    22,   215, 0x0,			STR_01F2_CURRENT_PROGRAM_OF_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    44,    51, 0x0,			STR_01F3_SELECT_ALL_TRACKS_PROGRAM},
 { WWT_PUSHIMGBTN,    14,   186,   245,    52,    59, 0x0,			STR_01F4_SELECT_OLD_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    60,    67, 0x0,			STR_01F5_SELECT_NEW_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   186,   245,    68,    75, 0x0,			STR_0330_SELECT_EZY_STREET_STYLE},
 { WWT_PUSHIMGBTN,    14,   186,   245,    76,    83, 0x0,			STR_01F6_SELECT_CUSTOM_1_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,    84,    91, 0x0,			STR_01F7_SELECT_CUSTOM_2_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   186,   245,   108,   115, 0x0,			STR_01F8_CLEAR_CURRENT_PROGRAM_CUSTOM1},
 { WWT_PUSHIMGBTN,    14,   186,   245,   124,   131, 0x0,			STR_01F9_SAVE_MUSIC_SETTINGS_TO},
 {   WIDGETS_END},
 };
 static const WindowDesc _music_track_selection_desc = {
@@ @@ -418,25 +418,25 @@ static void MusicWindowWndProc(Window *w @@
+}
 static const Widget _music_window_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   299,     0,    13, STR_01D2_JAZZ_JUKEBOX, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHIMGBTN,    14,     0,    21,    14,    35, 0x2C5, STR_01DE_SKIP_TO_PREVIOUS_TRACK},
 { WWT_PUSHIMGBTN,    14,    22,    43,    14,    35, 0x2C6, STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION},
 { WWT_PUSHIMGBTN,    14,    44,    65,    14,    35, 0x2C7, STR_01E0_STOP_PLAYING_MUSIC},
 { WWT_PUSHIMGBTN,    14,    66,    87,    14,    35, 0x2C8, STR_01E1_START_PLAYING_MUSIC},
 {     WWT_IMGBTN,    14,    88,   299,    14,    35, 0x0, STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC},
 {     WWT_IMGBTN,    14,   186,   201,    15,    34, 0x0},
 {     WWT_IMGBTN,    14,     0,   299,    36,    57, 0x0},
 {     WWT_IMGBTN,    14,    59,   240,    45,    53, 0x0},
 { WWT_PUSHIMGBTN,    14,     6,    55,    42,    49, 0x0, STR_01FB_TOGGLE_PROGRAM_SHUFFLE},
 { WWT_PUSHIMGBTN,    14,   244,   293,    42,    49, 0x0, STR_01FC_SHOW_MUSIC_TRACK_SELECTION},
 { WWT_PUSHIMGBTN,    14,     0,    49,    58,    65, 0x0, STR_01F3_SELECT_ALL_TRACKS_PROGRAM},
 { WWT_PUSHIMGBTN,    14,    50,    99,    58,    65, 0x0, STR_01F4_SELECT_OLD_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   100,   149,    58,    65, 0x0, STR_01F5_SELECT_NEW_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   150,   199,    58,    65, 0x0, STR_0330_SELECT_EZY_STREET_STYLE},
 { WWT_PUSHIMGBTN,    14,   200,   249,    58,    65, 0x0, STR_01F6_SELECT_CUSTOM_1_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   250,   299,    58,    65, 0x0, STR_01F7_SELECT_CUSTOM_2_USER_DEFINED},
 {      WWT_LAST},
 { WWT_PUSHIMGBTN,    14,     0,    21,    14,    35, 0x2C5,			STR_01DE_SKIP_TO_PREVIOUS_TRACK},
 { WWT_PUSHIMGBTN,    14,    22,    43,    14,    35, 0x2C6,			STR_01DF_SKIP_TO_NEXT_TRACK_IN_SELECTION},
 { WWT_PUSHIMGBTN,    14,    44,    65,    14,    35, 0x2C7,			STR_01E0_STOP_PLAYING_MUSIC},
 { WWT_PUSHIMGBTN,    14,    66,    87,    14,    35, 0x2C8,			STR_01E1_START_PLAYING_MUSIC},
 {     WWT_IMGBTN,    14,    88,   299,    14,    35, 0x0,				STR_01E2_DRAG_SLIDERS_TO_SET_MUSIC},
 {     WWT_IMGBTN,    14,   186,   201,    15,    34, 0x0,				STR_NULL},
 {     WWT_IMGBTN,    14,     0,   299,    36,    57, 0x0,				STR_NULL},
 {     WWT_IMGBTN,    14,    59,   240,    45,    53, 0x0,				STR_NULL},
 { WWT_PUSHIMGBTN,    14,     6,    55,    42,    49, 0x0,				STR_01FB_TOGGLE_PROGRAM_SHUFFLE},
 { WWT_PUSHIMGBTN,    14,   244,   293,    42,    49, 0x0,				STR_01FC_SHOW_MUSIC_TRACK_SELECTION},
 { WWT_PUSHIMGBTN,    14,     0,    49,    58,    65, 0x0,				STR_01F3_SELECT_ALL_TRACKS_PROGRAM},
 { WWT_PUSHIMGBTN,    14,    50,    99,    58,    65, 0x0,				STR_01F4_SELECT_OLD_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   100,   149,    58,    65, 0x0,				STR_01F5_SELECT_NEW_STYLE_MUSIC},
 { WWT_PUSHIMGBTN,    14,   150,   199,    58,    65, 0x0,				STR_0330_SELECT_EZY_STREET_STYLE},
 { WWT_PUSHIMGBTN,    14,   200,   249,    58,    65, 0x0,				STR_01F6_SELECT_CUSTOM_1_USER_DEFINED},
 { WWT_PUSHIMGBTN,    14,   250,   299,    58,    65, 0x0,				STR_01F7_SELECT_CUSTOM_2_USER_DEFINED},
 {   WIDGETS_END},
 };
 static const WindowDesc _music_window_desc = {

network_gui.c

➞

Show inline comments

@@ @@ -142,7 +142,7 @@ static const Widget _network_game_window @@
 { WWT_PUSHTXTBTN,   BTC,   145,   255,   180,   191, STR_012E_CANCEL,							STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,   270,   392,   180,   191, STR_NETWORK_JOIN_GAME,				STR_NULL},
-{       WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _network_game_window_desc = {
@@ @@ -273,7 +273,7 @@ static const Widget _network_start_serve @@
 { WWT_PUSHTXTBTN,   BTC,   110,   200,   180,   191, STR_NETWORK_LOAD_GAME,					STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,   210,   300,   180,   191, STR_NETWORK_LOAD_SCENARIO,			STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,   310,   390,   180,   191, STR_012E_CANCEL,								STR_NULL},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _network_start_server_window_desc = {
@@ @@ -382,7 +382,7 @@ static const Widget _network_lobby_windo @@
 { WWT_PUSHTXTBTN,   BTC,    80,   180,   280,   291, STR_NETWORK_READY,					STR_NULL},
 { WWT_PUSHTXTBTN,   BTC,   220,   320,   280,   291, STR_012E_CANCEL,						STR_NULL},
-{       WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _network_lobby_window_desc = {

news_gui.c

➞

Show inline comments

@@ @@ -244,9 +244,9 @@ void AddNewsItem(StringID string, uint32 @@
 static const byte _news_items_age[] = {60, 60, 90, 60, 90, 30, 150, 30, 90, 180};
 static const Widget _news_type13_widgets[] = {
 {      WWT_PANEL,    15,     0,   429,     0,   169, 0x0},
 {      WWT_PANEL,    15,     0,    10,     0,    11, 0x0},
 {      WWT_LAST},
 {      WWT_PANEL,    15,     0,   429,     0,   169, 0x0,	STR_NULL},
 {      WWT_PANEL,    15,     0,    10,     0,    11, 0x0,	STR_NULL},
 {   WIDGETS_END},
 };
 static WindowDesc _news_type13_desc = {
@@ @@ -258,9 +258,9 @@ static WindowDesc _news_type13_desc = { @@
 };
 static const Widget _news_type2_widgets[] = {
 {      WWT_PANEL,    15,     0,   429,     0,   129, 0x0},
 {      WWT_PANEL,    15,     0,    10,     0,    11, 0x0},
 {      WWT_LAST},
 {      WWT_PANEL,    15,     0,   429,     0,   129, 0x0,	STR_NULL},
 {      WWT_PANEL,    15,     0,    10,     0,    11, 0x0,	STR_NULL},
 {   WIDGETS_END},
 };
 static WindowDesc _news_type2_desc = {
@@ @@ -272,11 +272,11 @@ static WindowDesc _news_type2_desc = { @@
 };
 static const Widget _news_type0_widgets[] = {
 {      WWT_PANEL,     5,     0,   279,    14,    86, 0x0},
 {   WWT_CLOSEBOX,     5,     0,    10,     0,    13, STR_00C5},
 {    WWT_CAPTION,     5,    11,   279,     0,    13, STR_012C_MESSAGE},
 {          WWT_6,     5,     2,   277,    16,    64, 0},
 {      WWT_LAST},
 {      WWT_PANEL,     5,     0,   279,    14,    86, 0x0,								STR_NULL},
 {   WWT_CLOSEBOX,     5,     0,    10,     0,    13, STR_00C5,					STR_NULL},
 {    WWT_CAPTION,     5,    11,   279,     0,    13, STR_012C_MESSAGE,	STR_NULL},
 {          WWT_6,     5,     2,   277,    16,    64, 0x0,								STR_NULL},
 {   WIDGETS_END},
 };
 static WindowDesc _news_type0_desc = {
@@ @@ -562,7 +562,7 @@ static const Widget _message_history_wid @@
 {    WWT_CAPTION,    13,    11,   399,     0,    13, STR_MESSAGE_HISTORY,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,     0,   388,    14,   139, 0x0, STR_MESSAGE_HISTORY_TIP},
 {  WWT_SCROLLBAR,    13,   389,   399,    14,   139, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _message_history_desc = {
@@ @@ -642,34 +642,34 @@ static void MessageOptionsWndProc(Window @@
+}
 static const Widget _message_options_widgets[] = {
 {   WWT_CLOSEBOX,    13,     0,    10,     0,    13, STR_00C5,									STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   369,     0,    13, STR_0204_MESSAGE_OPTIONS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    13,     0,   369,    14,   172, 0x0},
 {   WWT_CLOSEBOX,     3,     2,    61,    26,    37, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    26,    37, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    38,    49, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    38,    49, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    50,    61, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    50,    61, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    62,    73, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    62,    73, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    74,    85, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    74,    85, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    86,    97, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    86,    97, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    98,   109, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,    98,   109, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   110,   121, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,   110,   121, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   122,   133, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,   122,   133, STR_02B9_FULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   134,   145, STR_02B8_SUMMARY},
 {   WWT_CLOSEBOX,     3,    62,   121,   134,   145, STR_02B9_FULL},
 {   WWT_CLOSEBOX,    13,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   369,     0,    13, STR_0204_MESSAGE_OPTIONS,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    13,     0,   369,    14,   172, 0x0,											STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    26,    37, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    26,    37, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    38,    49, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    38,    49, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    50,    61, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    50,    61, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    62,    73, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    62,    73, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    74,    85, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    74,    85, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    86,    97, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    86,    97, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,    98,   109, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,    98,   109, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   110,   121, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,   110,   121, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   122,   133, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,   122,   133, STR_02B9_FULL,						STR_NULL},
 {   WWT_CLOSEBOX,     3,     2,    61,   134,   145, STR_02B8_SUMMARY,				STR_NULL},
 {   WWT_CLOSEBOX,     3,    62,   121,   134,   145, STR_02B9_FULL,						STR_NULL},
 { WWT_PUSHTXTBTN,     3,    15,   170,   154,   165, STR_MESSAGES_DISABLE_ALL, STR_NULL },
 { WWT_PUSHTXTBTN,     3,   200,   355,   154,   165, STR_MESSAGES_ENABLE_ALL, STR_NULL },
 { WWT_PUSHTXTBTN,     3,    15,   170,   154,   165, STR_MESSAGES_DISABLE_ALL,STR_NULL },
 { WWT_PUSHTXTBTN,     3,   200,   355,   154,   165, STR_MESSAGES_ENABLE_ALL,	STR_NULL },
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _message_options_desc = {

order_gui.c

➞

Show inline comments

@@ @@ -388,17 +388,17 @@ static void OrdersWndProc(Window *w, Win @@
+}
 static const Widget _train_orders_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   308,    14,    75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    52,    76,    87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    53,   105,    76,    87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED},
 { WWT_PUSHTXTBTN,    14,   106,   158,    76,    87, STR_8825_NON_STOP, STR_8855_MAKE_THE_HIGHLIGHTED_ORDER},
 {WWT_NODISTXTBTN,    14,   159,   211,    76,    87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   212,   264,    76,    87, STR_FULLLOAD_OR_SERVICE, 0},
 { WWT_PUSHTXTBTN,    14,   265,   319,    76,    87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_8829_ORDERS,					STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   308,    14,    75, 0x0,											STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,											STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    52,    76,    87, STR_8823_SKIP,						STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    53,   105,    76,    87, STR_8824_DELETE,					STR_8854_DELETE_THE_HIGHLIGHTED},
 { WWT_PUSHTXTBTN,    14,   106,   158,    76,    87, STR_8825_NON_STOP,				STR_8855_MAKE_THE_HIGHLIGHTED_ORDER},
 {WWT_NODISTXTBTN,    14,   159,   211,    76,    87, STR_8826_GO_TO,					STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   212,   264,    76,    87, STR_FULLLOAD_OR_SERVICE,	STR_NULL},
 { WWT_PUSHTXTBTN,    14,   265,   319,    76,    87, STR_8828_UNLOAD,					STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {   WIDGETS_END},
 };
 static const WindowDesc _train_orders_desc = {
@@ @@ -414,7 +414,7 @@ static const Widget _other_train_orders_ @@
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   308,    14,    75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _other_train_orders_desc = {
@@ @@ -427,17 +427,17 @@ static const WindowDesc _other_train_ord @@
 static const Widget _roadveh_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_900B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, 0},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_900B_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP,		STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE,	STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,							STR_NULL},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO,	STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, STR_NULL},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD,	STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {   WIDGETS_END},
 };
 static const WindowDesc _roadveh_orders_desc = {
@@ @@ -449,11 +449,11 @@ static const WindowDesc _roadveh_orders_ @@
 };
 static const Widget _other_roadveh_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_900B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_900B_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static const WindowDesc _other_roadveh_orders_desc = {
@@ @@ -465,17 +465,17 @@ static const WindowDesc _other_roadveh_o @@
 };
 static const Widget _ship_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_9810_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, 0},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_9810_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP,		STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE,	STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,							STR_NULL},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO,	STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, STR_NULL},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD,	STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {   WIDGETS_END},
 };
 static const WindowDesc _ship_orders_desc = {
@@ @@ -487,11 +487,11 @@ static const WindowDesc _ship_orders_des @@
 };
 static const Widget _other_ship_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_9810_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_9810_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static const WindowDesc _other_ship_orders_desc = {
@@ @@ -504,17 +504,17 @@ static const WindowDesc _other_ship_orde @@
 static const Widget _aircraft_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_A00B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, 0},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_A00B_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    63,    76,    87, STR_8823_SKIP,		STR_8853_SKIP_THE_CURRENT_ORDER},
 { WWT_PUSHTXTBTN,    14,    64,   127,    76,    87, STR_8824_DELETE,	STR_8854_DELETE_THE_HIGHLIGHTED},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,							STR_NULL},
 {WWT_NODISTXTBTN,    14,   128,   191,    76,    87, STR_8826_GO_TO,	STR_8856_INSERT_A_NEW_ORDER_BEFORE},
 { WWT_PUSHTXTBTN,    14,   192,   255,    76,    87, STR_FULLLOAD_OR_SERVICE, STR_NULL},
 { WWT_PUSHTXTBTN,    14,   256,   319,    76,    87, STR_8828_UNLOAD,	STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
 {   WIDGETS_END},
 };
 static const WindowDesc _aircraft_orders_desc = {
@@ @@ -526,11 +526,11 @@ static const WindowDesc _aircraft_orders @@
 };
 static const Widget _other_aircraft_orders_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_A00B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   319,     0,    13, STR_A00B_ORDERS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   308,    14,    75, 0x0,							STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
 {  WWT_SCROLLBAR,    14,   309,   319,    14,    75, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {   WIDGETS_END},
 };
 static const WindowDesc _other_aircraft_orders_desc = {

player_gui.c

➞

Show inline comments

@@ @@ -84,43 +84,43 @@ static void DrawPlayerEconomyStats(Playe @@
+}
 static const Widget _player_finances_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   392,     0,    13, STR_700E_FINANCES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   393,   406,     0,    13, 0x2AA, STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {     WWT_IMGBTN,    14,     0,   406,    14,   169, 0x0, 0},
 {     WWT_IMGBTN,    14,     0,   406,   170,   203, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,   202,   204,   215, STR_7029_BORROW, STR_7035_INCREASE_SIZE_OF_LOAN},
 { WWT_PUSHTXTBTN,    14,   203,   406,   204,   215, STR_702A_REPAY, STR_7036_REPAY_PART_OF_LOAN},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   392,     0,    13, STR_700E_FINANCES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   393,   406,     0,    13, 0x2AA,							STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {     WWT_IMGBTN,    14,     0,   406,    14,   169, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   406,   170,   203, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   202,   204,   215, STR_7029_BORROW,		STR_7035_INCREASE_SIZE_OF_LOAN},
 { WWT_PUSHTXTBTN,    14,   203,   406,   204,   215, STR_702A_REPAY,		STR_7036_REPAY_PART_OF_LOAN},
 {   WIDGETS_END},
 };
 static const Widget _other_player_finances_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   392,     0,    13, STR_700E_FINANCES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   393,   406,     0,    13, 0x2AA, STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {     WWT_IMGBTN,    14,     0,   406,    14,   169, 0x0, 0},
 {     WWT_IMGBTN,    14,     0,   406,   170,   203, 0x0, 0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   392,     0,    13, STR_700E_FINANCES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   393,   406,     0,    13, 0x2AA,							STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {     WWT_IMGBTN,    14,     0,   406,    14,   169, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   406,   170,   203, 0x0,								STR_NULL},
 {   WIDGETS_END},
 };
 static const Widget _other_player_finances_small_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   265,     0,    13, STR_700E_FINANCES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   266,   279,     0,    13, 0x2AA, STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {     WWT_IMGBTN,    14,     0,   279,    14,    47, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   265,     0,    13, STR_700E_FINANCES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   266,   279,     0,    13, 0x2AA,							STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   279,    14,    47, 0x0,								STR_NULL},
 {   WIDGETS_END},
 };
 static const Widget _player_finances_small_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   265,     0,    13, STR_700E_FINANCES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   266,   279,     0,    13, 0x2AA, STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {     WWT_IMGBTN,    14,     0,   279,    14,    47, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,   139,    48,    59, STR_7029_BORROW, STR_7035_INCREASE_SIZE_OF_LOAN},
 { WWT_PUSHTXTBTN,    14,   140,   279,    48,    59, STR_702A_REPAY, STR_7036_REPAY_PART_OF_LOAN},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   265,     0,    13, STR_700E_FINANCES,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,   266,   279,     0,    13, 0x2AA,							STR_7075_TOGGLE_LARGE_SMALL_WINDOW},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    14,     0,   279,    14,    47, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   139,    48,    59, STR_7029_BORROW,		STR_7035_INCREASE_SIZE_OF_LOAN},
 { WWT_PUSHTXTBTN,    14,   140,   279,    48,    59, STR_702A_REPAY,		STR_7036_REPAY_PART_OF_LOAN},
 {   WIDGETS_END},
 };
@@ @@ -280,7 +280,7 @@ static const Widget _select_player_color @@
 {    WWT_CAPTION,    14,    11,   149,     0,    13, STR_7007_NEW_COLOR_SCHEME, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   138,    14,   127, 0x0, STR_7034_CLICK_ON_SELECTED_NEW_COLOR},
 {  WWT_SCROLLBAR,    14,   139,   149,    14,   127, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _select_player_color_desc = {
@@ @@ -324,15 +324,15 @@ static void SelectPlayerFaceWndProc(Wind @@
+}
 static const Widget _select_player_face_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   189,     0,    13, STR_7043_FACE_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   189,    14,   136, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,    94,   137,   148, STR_012E_CANCEL, STR_7047_CANCEL_NEW_FACE_SELECTION},
 { WWT_PUSHTXTBTN,    14,    95,   189,   137,   148, STR_012F_OK, STR_7048_ACCEPT_NEW_FACE_SELECTION},
 {    WWT_TEXTBTN,    14,    95,   187,    25,    36, STR_7044_MALE, STR_7049_SELECT_MALE_FACES},
 {    WWT_TEXTBTN,    14,    95,   187,    37,    48, STR_7045_FEMALE, STR_704A_SELECT_FEMALE_FACES},
 { WWT_PUSHTXTBTN,    14,    95,   187,    79,    90, STR_7046_NEW_FACE, STR_704B_GENERATE_RANDOM_NEW_FACE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   189,     0,    13, STR_7043_FACE_SELECTION,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   189,    14,   136, 0x0,											STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    94,   137,   148, STR_012E_CANCEL,					STR_7047_CANCEL_NEW_FACE_SELECTION},
 { WWT_PUSHTXTBTN,    14,    95,   189,   137,   148, STR_012F_OK,							STR_7048_ACCEPT_NEW_FACE_SELECTION},
 {    WWT_TEXTBTN,    14,    95,   187,    25,    36, STR_7044_MALE,						STR_7049_SELECT_MALE_FACES},
 {    WWT_TEXTBTN,    14,    95,   187,    37,    48, STR_7045_FEMALE,					STR_704A_SELECT_FEMALE_FACES},
 { WWT_PUSHTXTBTN,    14,    95,   187,    79,    90, STR_7046_NEW_FACE,				STR_704B_GENERATE_RANDOM_NEW_FACE},
 {   WIDGETS_END},
 };
 static const WindowDesc _select_player_face_desc = {
@@ @@ -344,43 +344,43 @@ static const WindowDesc _select_player_f @@
 };
 static const Widget _my_player_company_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,    89,   158,   169, STR_7004_NEW_FACE, STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT},
 { WWT_PUSHTXTBTN,    14,    90,   179,   158,   169, STR_7005_COLOR_SCHEME, STR_7031_CHANGE_THE_COMPANY_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   180,   269,   158,   169, STR_7009_PRESIDENT_NAME, STR_7032_CHANGE_THE_PRESIDENT_S},
 { WWT_PUSHTXTBTN,    14,   270,   359,   158,   169, STR_7008_COMPANY_NAME, STR_7033_CHANGE_THE_COMPANY_NAME},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_706F_BUILD_HQ, STR_7070_BUILD_COMPANY_HEADQUARTERS},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001,								STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0,											STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    89,   158,   169, STR_7004_NEW_FACE,				STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT},
 { WWT_PUSHTXTBTN,    14,    90,   179,   158,   169, STR_7005_COLOR_SCHEME,		STR_7031_CHANGE_THE_COMPANY_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   180,   269,   158,   169, STR_7009_PRESIDENT_NAME,	STR_7032_CHANGE_THE_PRESIDENT_S},
 { WWT_PUSHTXTBTN,    14,   270,   359,   158,   169, STR_7008_COMPANY_NAME,		STR_7033_CHANGE_THE_COMPANY_NAME},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_706F_BUILD_HQ,				STR_7070_BUILD_COMPANY_HEADQUARTERS},
 {   WIDGETS_END},
 };
 static const Widget _other_player_company_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0, 0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_7072_VIEW_HQ, STR_7070_BUILD_COMPANY_HEADQUARTERS},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,   179,   158,   169, STR_7077_BUY_25_SHARE_IN_COMPANY, STR_7079_BUY_25_SHARE_IN_THIS_COMPANY},
 { WWT_PUSHTXTBTN,    14,   180,   359,   158,   169, STR_7078_SELL_25_SHARE_IN_COMPANY, STR_707A_SELL_25_SHARE_IN_THIS_COMPANY},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001,					STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0,								STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_7072_VIEW_HQ,	STR_7070_BUILD_COMPANY_HEADQUARTERS},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   179,   158,   169, STR_7077_BUY_25_SHARE_IN_COMPANY,	STR_7079_BUY_25_SHARE_IN_THIS_COMPANY},
 { WWT_PUSHTXTBTN,    14,   180,   359,   158,   169, STR_7078_SELL_25_SHARE_IN_COMPANY,	STR_707A_SELL_25_SHARE_IN_THIS_COMPANY},
 {   WIDGETS_END},
 };
 static const Widget _my_player_company_bh_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0, 0},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   359,     0,    13, STR_7001,					STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   359,    14,   157, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    89,   158,   169, STR_7004_NEW_FACE, STR_7030_SELECT_NEW_FACE_FOR_PRESIDENT},
 { WWT_PUSHTXTBTN,    14,    90,   179,   158,   169, STR_7005_COLOR_SCHEME, STR_7031_CHANGE_THE_COMPANY_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   180,   269,   158,   169, STR_7009_PRESIDENT_NAME, STR_7032_CHANGE_THE_PRESIDENT_S},
 { WWT_PUSHTXTBTN,    14,   270,   359,   158,   169, STR_7008_COMPANY_NAME, STR_7033_CHANGE_THE_COMPANY_NAME},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_7072_VIEW_HQ, STR_7070_BUILD_COMPANY_HEADQUARTERS},
 { WWT_PUSHTXTBTN,    14,   266,   355,    32,    43, STR_RELOCATE_HQ, STR_RELOCATE_COMPANY_HEADQUARTERS},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,    90,   179,   158,   169, STR_7005_COLOR_SCHEME,		STR_7031_CHANGE_THE_COMPANY_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   180,   269,   158,   169, STR_7009_PRESIDENT_NAME,	STR_7032_CHANGE_THE_PRESIDENT_S},
 { WWT_PUSHTXTBTN,    14,   270,   359,   158,   169, STR_7008_COMPANY_NAME,		STR_7033_CHANGE_THE_COMPANY_NAME},
 { WWT_PUSHTXTBTN,    14,   266,   355,    18,    29, STR_7072_VIEW_HQ,	STR_7070_BUILD_COMPANY_HEADQUARTERS},
 { WWT_PUSHTXTBTN,    14,   266,   355,    32,    43, STR_RELOCATE_HQ,		STR_RELOCATE_COMPANY_HEADQUARTERS},
 {   WIDGETS_END},
 };
 static void DrawPlayerVehiclesAmount(int player)
@@ @@ -664,12 +664,12 @@ static void BuyCompanyWndProc(Window *w, @@
+}
 static const Widget _buy_company_widgets[] = {
 {    WWT_TEXTBTN,     5,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     5,    11,   333,     0,    13, STR_00B3_MESSAGE_FROM, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     5,     0,   333,    14,   136, 0x0},
 {    WWT_TEXTBTN,     5,   148,   207,   117,   128, STR_00C9_NO},
 {    WWT_TEXTBTN,     5,   218,   277,   117,   128, STR_00C8_YES},
 {      WWT_LAST},
 {    WWT_TEXTBTN,     5,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     5,    11,   333,     0,    13, STR_00B3_MESSAGE_FROM,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     5,     0,   333,    14,   136, 0x0,										STR_NULL},
 {    WWT_TEXTBTN,     5,   148,   207,   117,   128, STR_00C9_NO,						STR_NULL},
 {    WWT_TEXTBTN,     5,   218,   277,   117,   128, STR_00C8_YES,					STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _buy_company_desc = {

rail_gui.c

➞

Show inline comments

@@ @@ -681,33 +681,33 @@ static void BuildRailToolbWndProc(Window @@
+}
 static const Widget _build_railroad_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {   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_PANEL,     7,    110,  113,    14,    35, 0x0, 0x0},
+{      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,    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,    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,   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,   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,   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,   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,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_railroad_desc = {
@@ @@ -719,32 +719,32 @@ static const WindowDesc _build_railroad_ @@
 };
 static const Widget _build_monorail_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {   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_PANEL,     7,   110,   113,    14,    35, 0x0, 0x0},
+{      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,     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,   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,   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,   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,   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,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 27, STR_CONVERT_RAIL_TIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_monorail_desc = {
@@ @@ -756,32 +756,32 @@ static const WindowDesc _build_monorail_ @@
 };
 static const Widget _build_maglev_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {   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_PANEL,     7,   110,   113,    14,    35, 0x0, 0x0},
+{      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,     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,   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,   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,   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,   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,   202,   223,    14,    35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP},
 {      WWT_PANEL,     7,   396,   417,    14,    35, SPR_OPENTTD_BASE + 29, STR_CONVERT_RAIL_TIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_maglev_desc = {
@@ @@ -939,34 +939,34 @@ static void StationBuildWndProc(Window * @@
+}
 static const Widget _station_builder_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   147,     0,    13, STR_3000_RAIL_STATION_SELECTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   147,    14,   199, 0x0, 0},
 {      WWT_PANEL,    14,     7,    72,    26,    73, 0x0, STR_304E_SELECT_RAILROAD_STATION},
 {      WWT_PANEL,    14,    75,   140,    26,    73, 0x0, STR_304E_SELECT_RAILROAD_STATION},
 {      WWT_PANEL,     7,     0,   147,    14,   199, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,     7,    72,    26,    73, 0x0,					STR_304E_SELECT_RAILROAD_STATION},
 {      WWT_PANEL,    14,    75,   140,    26,    73, 0x0,					STR_304E_SELECT_RAILROAD_STATION},
 {   WWT_CLOSEBOX,    14,    22,    36,    87,    98, STR_00CB_1, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    37,    51,    87,    98, STR_00CC_2, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    52,    66,    87,    98, STR_00CD_3, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    67,    81,    87,    98, STR_00CE_4, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    82,    96,    87,    98, STR_00CF_5, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    97,   111,    87,    98, STR_0335_6, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,   112,   126,    87,    98, STR_0336_7, STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    22,    36,    87,    98, STR_00CB_1,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    37,    51,    87,    98, STR_00CC_2,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    52,    66,    87,    98, STR_00CD_3,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    67,    81,    87,    98, STR_00CE_4,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    82,    96,    87,    98, STR_00CF_5,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    97,   111,    87,    98, STR_0335_6,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,   112,   126,    87,    98, STR_0336_7,	STR_304F_SELECT_NUMBER_OF_PLATFORMS},
 {   WWT_CLOSEBOX,    14,    22,    36,   112,   123, STR_00CB_1, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    37,    51,   112,   123, STR_00CC_2, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    52,    66,   112,   123, STR_00CD_3, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    67,    81,   112,   123, STR_00CE_4, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    82,    96,   112,   123, STR_00CF_5, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    97,   111,   112,   123, STR_0335_6, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,   112,   126,   112,   123, STR_0336_7, STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    22,    36,   112,   123, STR_00CB_1,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    37,    51,   112,   123, STR_00CC_2,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    52,    66,   112,   123, STR_00CD_3,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    67,    81,   112,   123, STR_00CE_4,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    82,    96,   112,   123, STR_00CF_5,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,    97,   111,   112,   123, STR_0335_6,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 {   WWT_CLOSEBOX,    14,   112,   126,   112,   123, STR_0336_7,	STR_3050_SELECT_LENGTH_OF_RAILROAD},
 //{   WWT_CLOSEBOX,    14,    14,    73,   137,   148, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 //{   WWT_CLOSEBOX,    14,    74,   133,   137,   148, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WWT_CLOSEBOX,    14,    37,   111,   126,   137, STR_DRAG_DROP, STR_STATION_DRAG_DROP},
 {   WWT_CLOSEBOX,    14,    14,    73,   152,   163, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    74,   133,   152,   163, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _station_builder_desc = {
@@ @@ -1022,14 +1022,14 @@ static void BuildTrainDepotWndProc(Windo @@
+}
 static const Widget _build_depot_widgets[] = {
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   139,     0,    13, STR_1014_TRAIN_DEPOT_ORIENTATION,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   139,    14,   121, 0x0, 0},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0, STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   139,     0,    13, STR_1014_TRAIN_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   139,    14,   121, 0x0,			STR_NULL},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0,			STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0,			STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0,			STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0,			STR_1020_SELECT_RAILROAD_DEPOT_ORIENTATIO},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_depot_desc = {

road_gui.c

➞

Show inline comments

@@ @@ -291,7 +291,7 @@ static const Widget _build_road_widgets[ @@
 {      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_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _build_road_desc = {
@@ @@ -309,20 +309,20 @@ void ShowBuildRoadToolbar() @@
+}
 static const Widget _build_road_scen_widgets[] = {
-{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,     7,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   195,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,     7,     0,    21,    14,    35, 0x51D, STR_180B_BUILD_ROAD_SECTION},
 {     WWT_IMGBTN,     7,    22,    43,    14,    35, 0x51E, STR_180B_BUILD_ROAD_SECTION},
 {     WWT_IMGBTN,     7,    44,    65,    14,    35, 0x2BF, STR_018D_DEMOLISH_BUILDINGS_ETC},
 {     WWT_IMGBTN,     7,    66,    87,    14,    35, 0x2B7, STR_018E_LOWER_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,     7,    88,   109,    14,    35, 0x2B6, STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 {     WWT_IMGBTN,     7,   110,   151,    14,    35, 0xA22, STR_180F_BUILD_ROAD_BRIDGE},
 {     WWT_IMGBTN,     7,   152,   173,    14,    35, 0x97D, STR_1810_BUILD_ROAD_TUNNEL},
 {     WWT_IMGBTN,     7,   174,   195,    14,    35, 0x2CA, STR_1811_TOGGLE_BUILD_REMOVE_FOR},
 {      WWT_LAST},
 {     WWT_IMGBTN,     7,     0,    21,    14,    35, 0x51D,			STR_180B_BUILD_ROAD_SECTION},
 {     WWT_IMGBTN,     7,    22,    43,    14,    35, 0x51E,			STR_180B_BUILD_ROAD_SECTION},
 {     WWT_IMGBTN,     7,    44,    65,    14,    35, 0x2BF,			STR_018D_DEMOLISH_BUILDINGS_ETC},
 {     WWT_IMGBTN,     7,    66,    87,    14,    35, 0x2B7,			STR_018E_LOWER_A_CORNER_OF_LAND},
 {     WWT_IMGBTN,     7,    88,   109,    14,    35, 0x2B6,			STR_018F_RAISE_A_CORNER_OF_LAND},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,				STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,				STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,				STR_NULL},
 {     WWT_IMGBTN,     7,   110,   151,    14,    35, 0xA22,			STR_180F_BUILD_ROAD_BRIDGE},
 {     WWT_IMGBTN,     7,   152,   173,    14,    35, 0x97D,			STR_1810_BUILD_ROAD_TUNNEL},
 {     WWT_IMGBTN,     7,   174,   195,    14,    35, 0x2CA,			STR_1811_TOGGLE_BUILD_REMOVE_FOR},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_scen_desc = {
@@ @@ -374,14 +374,14 @@ static void BuildRoadDepotWndProc(Window @@
+}
 static const Widget _build_road_depot_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   139,     0,    13, STR_1806_ROAD_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   139,    14,   121, 0x0, 0},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0, STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_LAST},
 {      WWT_PANEL,     7,     0,   139,    14,   121, 0x0,			STR_NULL},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0,			STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0,			STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0,			STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0,			STR_1813_SELECT_ROAD_VEHICLE_DEPOT},
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_depot_desc = {
@@ @@ -458,16 +458,16 @@ static void RoadStationPickerWndProc(Win @@
+}
 static const Widget _bus_station_picker_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   139,     0,    13, STR_3042_BUS_STATION_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   139,    14,   176, 0x0, 0},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0, STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {   WWT_CLOSEBOX,    14,    10,    69,   133,   144, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    70,   129,   133,   144, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {      WWT_LAST},
 {      WWT_PANEL,     7,     0,   139,    14,   176, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0,					STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0,					STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0,					STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0,					STR_3051_SELECT_BUS_STATION_ORIENTATION},
 {   WWT_CLOSEBOX,    14,    10,    69,   133,   144, STR_02DB_OFF,STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    70,   129,   133,   144, STR_02DA_ON,	STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WIDGETS_END},
 };
 static const WindowDesc _bus_station_picker_desc = {
@@ @@ -484,16 +484,16 @@ static void ShowBusStationPicker() @@
+}
 static const Widget _truck_station_picker_widgets[] = {
-{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{   WWT_CLOSEBOX,     7,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,     7,    11,   139,     0,    13, STR_3043_TRUCK_STATION_ORIENT, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,     7,     0,   139,    14,   176, 0x0, 0},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0, STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0, STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0, STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0, STR_3052_SELECT_TRUCK_LOADING_BAY},
 {   WWT_CLOSEBOX,    14,    10,    69,   133,   144, STR_02DB_OFF, STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    70,   129,   133,   144, STR_02DA_ON, STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {      WWT_LAST},
 {      WWT_PANEL,     7,     0,   139,    14,   176, 0x0,					STR_NULL},
 {      WWT_PANEL,    14,    71,   136,    17,    66, 0x0,					STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,    71,   136,    69,   118, 0x0,					STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,     3,    68,    69,   118, 0x0,					STR_3052_SELECT_TRUCK_LOADING_BAY},
 {      WWT_PANEL,    14,     3,    68,    17,    66, 0x0,					STR_3052_SELECT_TRUCK_LOADING_BAY},
 {   WWT_CLOSEBOX,    14,    10,    69,   133,   144, STR_02DB_OFF,STR_3065_DON_T_HIGHLIGHT_COVERAGE},
 {   WWT_CLOSEBOX,    14,    70,   129,   133,   144, STR_02DA_ON,	STR_3064_HIGHLIGHT_COVERAGE_AREA},
 {   WIDGETS_END},
 };
 static const WindowDesc _truck_station_picker_desc = {

roadveh_gui.c

➞

Show inline comments

@@ @@ -155,15 +155,15 @@ change_int: @@
+}
 static const Widget _roadveh_details_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   339,     0,    13, STR_900C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   340,   379,     0,    13, STR_01AA_NAME, STR_902E_NAME_ROAD_VEHICLE},
 {     WWT_IMGBTN,    14,     0,   379,    14,    55, 0x0},
 {     WWT_IMGBTN,    14,     0,   379,    56,    88, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,    10,    89,    94, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    95,   100, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   379,    89,   100, 0x0},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   339,     0,    13, STR_900C_DETAILS,STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   340,   379,     0,    13, STR_01AA_NAME,		STR_902E_NAME_ROAD_VEHICLE},
 {     WWT_IMGBTN,    14,     0,   379,    14,    55, 0x0,							STR_NULL},
 {     WWT_IMGBTN,    14,     0,   379,    56,    88, 0x0,							STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    89,    94, STR_0188,				STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    95,   100, STR_0189,				STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   379,    89,   100, 0x0,							STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _roadveh_details_desc = {
@@ @@ -276,17 +276,17 @@ static void RoadVehViewWndProc(Window *w @@
+}
 static const Widget _roadveh_view_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_9002, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0},
 {          WWT_6,    14,     2,   229,    16,   101, 0},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0, STR_901C_CURRENT_VEHICLE_ACTION},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB, STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AE, STR_901F_SEND_VEHICLE_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2CB, STR_9020_FORCE_VEHICLE_TO_TURN_AROUND},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2, STR_901D_SHOW_VEHICLE_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3, STR_9021_SHOW_ROAD_VEHICLE_DETAILS},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_9002,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0,				STR_NULL},
 {          WWT_6,    14,     2,   229,    16,   101, 0x0,				STR_NULL},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0,				STR_901C_CURRENT_VEHICLE_ACTION},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB,			STR_901E_CENTER_MAIN_VIEW_ON_VEHICLE},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AE,			STR_901F_SEND_VEHICLE_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2CB,			STR_9020_FORCE_VEHICLE_TO_TURN_AROUND},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2,			STR_901D_SHOW_VEHICLE_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3,			STR_9021_SHOW_ROAD_VEHICLE_DETAILS},
 {   WIDGETS_END},
 };
 static const WindowDesc _roadveh_view_desc = {
@@ @@ -441,14 +441,14 @@ static void NewRoadVehWndProc(Window *w, @@
+}
 static const Widget _new_road_veh_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   247,     0,    13, STR_9006_NEW_ROAD_VEHICLES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   236,    14,   125, 0x801, STR_9026_ROAD_VEHICLE_SELECTION},
 {  WWT_SCROLLBAR,    14,   237,   247,    14,   125, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   247,   126,   177, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,   123,   178,   189, STR_9007_BUILD_VEHICLE, STR_9027_BUILD_THE_HIGHLIGHTED_ROAD},
 { WWT_PUSHTXTBTN,    14,   124,   247,   178,   189, STR_9034_RENAME, STR_9035_RENAME_ROAD_VEHICLE_TYPE},
 {      WWT_LAST},
 {     WWT_MATRIX,    14,     0,   236,    14,   125, 0x801,									STR_9026_ROAD_VEHICLE_SELECTION},
 {  WWT_SCROLLBAR,    14,   237,   247,    14,   125, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   247,   126,   177, 0x0,										STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   123,   178,   189, STR_9007_BUILD_VEHICLE,STR_9027_BUILD_THE_HIGHLIGHTED_ROAD},
 { WWT_PUSHTXTBTN,    14,   124,   247,   178,   189, STR_9034_RENAME,				STR_9035_RENAME_ROAD_VEHICLE_TYPE},
 {   WIDGETS_END},
 };
 static const WindowDesc _new_road_veh_desc = {
@@ @@ -679,7 +679,7 @@ static const Widget _road_depot_widgets[ @@
 {  WWT_SCROLLBAR,    14,   304,   314,    14,    55, 0x0,  STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   156,    56,    67, STR_9004_NEW_VEHICLES, STR_9023_BUILD_NEW_ROAD_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   157,   314,    56,    67, STR_00E4_LOCATION, STR_9025_CENTER_MAIN_VIEW_ON_ROAD},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _road_depot_desc = {
@@ @@ -917,12 +917,12 @@ static const Widget _player_roadveh_widg @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,							STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,											STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,								STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,											0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,											STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   207, 0x701,										STR_883D_TRAINS_CLICK_ON_TRAIN_FOR},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   207, 0x0,											STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   129,   208,   219, STR_8815_NEW_VEHICLES,		STR_883E_BUILD_NEW_TRAINS_REQUIRES},
 {      WWT_PANEL,    14,   130,   259,   208,   219, 0x0,											0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,   130,   259,   208,   219, 0x0,											STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _player_roadveh_desc = {
@@ @@ -939,10 +939,10 @@ static const Widget _other_player_roadve @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,							STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,											STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,								STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,											0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,											STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   207, 0x701,										STR_883D_TRAINS_CLICK_ON_TRAIN_FOR},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   207, 0x0,											STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _other_player_roadveh_desc = {

settings_gui.c

➞

Show inline comments

@@ @@ -195,42 +195,42 @@ int32 CmdSetTownNameType(int x, int y, u @@
 static const Widget _game_options_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   369,     0,    13, STR_00B1_GAME_OPTIONS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   369,    14,   233, 0x0},
 {      WWT_FRAME,    14,    10,   179,    20,    55, STR_02E0_CURRENCY_UNITS},
 {          WWT_6,    14,    20,   169,    34,    45, STR_02E1, STR_02E2_CURRENCY_UNITS_SELECTION},
 {   WWT_CLOSEBOX,    14,   158,   168,    35,    44, STR_0225, STR_02E2_CURRENCY_UNITS_SELECTION},
 {      WWT_FRAME,    14,   190,   359,    20,    55, STR_02E3_DISTANCE_UNITS},
 {          WWT_6,    14,   200,   349,    34,    45, STR_02E4, STR_02E5_DISTANCE_UNITS_SELECTION},
 {   WWT_CLOSEBOX,    14,   338,   348,    35,    44, STR_0225, STR_02E5_DISTANCE_UNITS_SELECTION},
 {      WWT_FRAME,    14,    10,   179,    62,    97, STR_02E6_ROAD_VEHICLES},
 {          WWT_6,    14,    20,   169,    76,    87, STR_02E7, STR_02E8_SELECT_SIDE_OF_ROAD_FOR},
 {   WWT_CLOSEBOX,    14,   158,   168,    77,    86, STR_0225, STR_02E8_SELECT_SIDE_OF_ROAD_FOR},
 {      WWT_FRAME,    14,   190,   359,    62,    97, STR_02EB_TOWN_NAMES},
 {          WWT_6,    14,   200,   349,    76,    87, STR_02EC, STR_02ED_SELECT_STYLE_OF_TOWN_NAMES},
 {   WWT_CLOSEBOX,    14,   338,   348,    77,    86, STR_0225, STR_02ED_SELECT_STYLE_OF_TOWN_NAMES},
 {      WWT_FRAME,    14,    10,   179,   104,   139, STR_02F4_AUTOSAVE},
 {          WWT_6,    14,    20,   169,   118,   129, STR_02F5, STR_02F6_SELECT_INTERVAL_BETWEEN},
 {   WWT_CLOSEBOX,    14,   158,   168,   119,   128, STR_0225, STR_02F6_SELECT_INTERVAL_BETWEEN},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,								STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   369,     0,    13, STR_00B1_GAME_OPTIONS,		STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   369,    14,   233, 0x0,											STR_NULL},
 {      WWT_FRAME,    14,    10,   179,    20,    55, STR_02E0_CURRENCY_UNITS,	STR_NULL},
 {          WWT_6,    14,    20,   169,    34,    45, STR_02E1,								STR_02E2_CURRENCY_UNITS_SELECTION},
 {   WWT_CLOSEBOX,    14,   158,   168,    35,    44, STR_0225,								STR_02E2_CURRENCY_UNITS_SELECTION},
 {      WWT_FRAME,    14,   190,   359,    20,    55, STR_02E3_DISTANCE_UNITS,	STR_NULL},
 {          WWT_6,    14,   200,   349,    34,    45, STR_02E4,								STR_02E5_DISTANCE_UNITS_SELECTION},
 {   WWT_CLOSEBOX,    14,   338,   348,    35,    44, STR_0225,								STR_02E5_DISTANCE_UNITS_SELECTION},
 {      WWT_FRAME,    14,    10,   179,    62,    97, STR_02E6_ROAD_VEHICLES,	STR_NULL},
 {          WWT_6,    14,    20,   169,    76,    87, STR_02E7,								STR_02E8_SELECT_SIDE_OF_ROAD_FOR},
 {   WWT_CLOSEBOX,    14,   158,   168,    77,    86, STR_0225,								STR_02E8_SELECT_SIDE_OF_ROAD_FOR},
 {      WWT_FRAME,    14,   190,   359,    62,    97, STR_02EB_TOWN_NAMES,			STR_NULL},
 {          WWT_6,    14,   200,   349,    76,    87, STR_02EC,								STR_02ED_SELECT_STYLE_OF_TOWN_NAMES},
 {   WWT_CLOSEBOX,    14,   338,   348,    77,    86, STR_0225,								STR_02ED_SELECT_STYLE_OF_TOWN_NAMES},
 {      WWT_FRAME,    14,    10,   179,   104,   139, STR_02F4_AUTOSAVE,				STR_NULL},
 {          WWT_6,    14,    20,   169,   118,   129, STR_02F5,								STR_02F6_SELECT_INTERVAL_BETWEEN},
 {   WWT_CLOSEBOX,    14,   158,   168,   119,   128, STR_0225,								STR_02F6_SELECT_INTERVAL_BETWEEN},
 {      WWT_FRAME,    14,    10,   359,   188,   223, STR_02BC_VEHICLE_DESIGN_NAMES},
 {          WWT_6,    14,    20,   119,   202,   213, STR_02BD, STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
 {   WWT_CLOSEBOX,    14,   108,   118,   203,   212, STR_0225, STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
 {   WWT_CLOSEBOX,    14,   130,   349,   202,   213, STR_02C0_SAVE_CUSTOM_NAMES_TO_DISK, STR_02C2_SAVE_CUSTOMIZED_VEHICLE},
 {      WWT_FRAME,    14,    10,   359,   188,   223, STR_02BC_VEHICLE_DESIGN_NAMES,				STR_NULL},
 {          WWT_6,    14,    20,   119,   202,   213, STR_02BD,								STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
 {   WWT_CLOSEBOX,    14,   108,   118,   203,   212, STR_0225,								STR_02C1_VEHICLE_DESIGN_NAMES_SELECTION},
 {   WWT_CLOSEBOX,    14,   130,   349,   202,   213, STR_02C0_SAVE_CUSTOM_NAMES_TO_DISK,	STR_02C2_SAVE_CUSTOMIZED_VEHICLE},
 {      WWT_FRAME,    14,   190,   359,   104,   139, STR_OPTIONS_LANG},
 {          WWT_6,    14,   200,   349,   118,   129, STR_OPTIONS_LANG_CBO, STR_OPTIONS_LANG_TIP},
 {   WWT_CLOSEBOX,    14,   338,   348,   119,   128, STR_0225, STR_OPTIONS_LANG_TIP},
 {      WWT_FRAME,    14,    10,   179,   146,   181, STR_OPTIONS_RES},
 {          WWT_6,    14,    20,   169,   160,   171, STR_OPTIONS_RES_CBO, STR_OPTIONS_RES_TIP},
 {   WWT_CLOSEBOX,    14,   158,   168,   161,   170, STR_0225, STR_OPTIONS_RES_TIP},
 {      WWT_FRAME,    14,   190,   359,   104,   139, STR_OPTIONS_LANG,				STR_NULL},
 {          WWT_6,    14,   200,   349,   118,   129, STR_OPTIONS_LANG_CBO,		STR_OPTIONS_LANG_TIP},
 {   WWT_CLOSEBOX,    14,   338,   348,   119,   128, STR_0225,								STR_OPTIONS_LANG_TIP},
 {      WWT_FRAME,    14,    10,   179,   146,   181, STR_OPTIONS_RES,					STR_NULL},
 {          WWT_6,    14,    20,   169,   160,   171, STR_OPTIONS_RES_CBO,			STR_OPTIONS_RES_TIP},
 {   WWT_CLOSEBOX,    14,   158,   168,   161,   170, STR_0225,								STR_OPTIONS_RES_TIP},
 {      WWT_FRAME,    14,   190,   359,   146,   181, STR_OPTIONS_SCREENSHOT_FORMAT},
 {          WWT_6,    14,   200,   349,   160,   171, STR_OPTIONS_SCREENSHOT_FORMAT_CBO, STR_OPTIONS_SCREENSHOT_FORMAT_TIP},
 {   WWT_CLOSEBOX,    14,   338,   348,   161,   170, STR_0225, STR_OPTIONS_SCREENSHOT_FORMAT_TIP},
 {      WWT_FRAME,    14,   190,   359,   146,   181, STR_OPTIONS_SCREENSHOT_FORMAT,			STR_NULL},
 {          WWT_6,    14,   200,   349,   160,   171, STR_OPTIONS_SCREENSHOT_FORMAT_CBO,	STR_OPTIONS_SCREENSHOT_FORMAT_TIP},
 {   WWT_CLOSEBOX,    14,   338,   348,   161,   170, STR_0225,								STR_OPTIONS_SCREENSHOT_FORMAT_TIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _game_options_desc = {
@@ @@ -438,20 +438,20 @@ static void GameDifficultyWndProc(Window @@
+}
 static const Widget _game_difficulty_widgets[] = {
 {   WWT_CLOSEBOX,    10,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    10,    11,   369,     0,    13, STR_6800_DIFFICULTY_LEVEL, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    10,     0,   369,    14,    29, 0x0, 0},
 {      WWT_PANEL,    10,     0,   369,    30,   276, 0x0, 0},
 { WWT_PUSHTXTBTN,     3,    10,    96,    16,    27, STR_6801_EASY, 0},
 { WWT_PUSHTXTBTN,     3,    97,   183,    16,    27, STR_6802_MEDIUM, 0},
 { WWT_PUSHTXTBTN,     3,   184,   270,    16,    27, STR_6803_HARD, 0},
 { WWT_PUSHTXTBTN,     3,   271,   357,    16,    27, STR_6804_CUSTOM, 0},
 {      WWT_EMPTY,       10,     0,   369,   251,   262, 0x0, 0},
 //{   WWT_CLOSEBOX,    10,     0,   369,   251,   262, STR_6838_SHOW_HI_SCORE_CHART, 0},
 {      WWT_PANEL,    10,     0,   369,   263,   278, 0x0, 0},
 { WWT_PUSHTXTBTN,     3,   105,   185,   265,   276, STR_OPTIONS_SAVE_CHANGES, 0},
 { WWT_PUSHTXTBTN,     3,   186,   266,   265,   276, STR_012E_CANCEL, 0},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    10,     0,    10,     0,    13, STR_00C5,									STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    10,    11,   369,     0,    13, STR_6800_DIFFICULTY_LEVEL,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    10,     0,   369,    14,    29, 0x0,												STR_NULL},
 {      WWT_PANEL,    10,     0,   369,    30,   276, 0x0,												STR_NULL},
 { WWT_PUSHTXTBTN,     3,    10,    96,    16,    27, STR_6801_EASY,							STR_NULL},
 { WWT_PUSHTXTBTN,     3,    97,   183,    16,    27, STR_6802_MEDIUM,						STR_NULL},
 { WWT_PUSHTXTBTN,     3,   184,   270,    16,    27, STR_6803_HARD,							STR_NULL},
 { WWT_PUSHTXTBTN,     3,   271,   357,    16,    27, STR_6804_CUSTOM,						STR_NULL},
 {      WWT_EMPTY,    10,     0,   369,   251,   262, 0x0,												STR_NULL},
 //{   WWT_CLOSEBOX,    10,     0,   369,   251,   262, STR_6838_SHOW_HI_SCORE_CHART,STR_NULL},
 {      WWT_PANEL,    10,     0,   369,   263,   278, 0x0,												STR_NULL},
 { WWT_PUSHTXTBTN,     3,   105,   185,   265,   276, STR_OPTIONS_SAVE_CHANGES,	STR_NULL},
 { WWT_PUSHTXTBTN,     3,   186,   266,   265,   276, STR_012E_CANCEL,						STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _game_difficulty_desc = {
@@ @@ -894,18 +894,18 @@ static void PatchesSelectionWndProc(Wind @@
+}
 static const Widget _patches_selection_widgets[] = {
 {   WWT_CLOSEBOX,    10,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    10,    11,   369,     0,    13, STR_CONFIG_PATCHES_CAPTION, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    10,     0,   369,    14,    41, 0x0, 0},
 {      WWT_PANEL,    10,     0,   369,    42,   320, 0x0, 0},
 {   WWT_CLOSEBOX,    10,     0,    10,     0,    13, STR_00C5,												STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    10,    11,   369,     0,    13, STR_CONFIG_PATCHES_CAPTION,			STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    10,     0,   369,    14,    41, 0x0,															STR_NULL},
 {      WWT_PANEL,    10,     0,   369,    42,   320, 0x0,															STR_NULL},
 {   WWT_CLOSEBOX,     3,    10,    96,    16,    27, STR_CONFIG_PATCHES_GUI, 0},
 {   WWT_CLOSEBOX,     3,    97,   183,    16,    27, STR_CONFIG_PATCHES_CONSTRUCTION, 0},
 {   WWT_CLOSEBOX,     3,   184,   270,    16,    27, STR_CONFIG_PATCHES_VEHICLES, 0},
 {   WWT_CLOSEBOX,     3,   271,   357,    16,    27, STR_CONFIG_PATCHES_STATIONS, 0},
 {   WWT_CLOSEBOX,     3,    10,    96,    28,    39, STR_CONFIG_PATCHES_ECONOMY, 0},
 {   WWT_CLOSEBOX,     3,    97,   183,    28,    39, STR_CONFIG_PATCHES_AI, 0},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,     3,    10,    96,    16,    27, STR_CONFIG_PATCHES_GUI,					STR_NULL},
 {   WWT_CLOSEBOX,     3,    97,   183,    16,    27, STR_CONFIG_PATCHES_CONSTRUCTION,	STR_NULL},
 {   WWT_CLOSEBOX,     3,   184,   270,    16,    27, STR_CONFIG_PATCHES_VEHICLES,			STR_NULL},
 {   WWT_CLOSEBOX,     3,   271,   357,    16,    27, STR_CONFIG_PATCHES_STATIONS,			STR_NULL},
 {   WWT_CLOSEBOX,     3,    10,    96,    28,    39, STR_CONFIG_PATCHES_ECONOMY,			STR_NULL},
 {   WWT_CLOSEBOX,     3,    97,   183,    28,    39, STR_CONFIG_PATCHES_AI,						STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _patches_selection_desc = {

ship_gui.c

➞

Show inline comments

@@ @@ -115,12 +115,12 @@ static void ShipRefitWndProc(Window *w, @@
 static const Widget _ship_refit_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_983B_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0, STR_983D_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_983C_REFIT_SHIP, STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,						STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_983B_REFIT,			STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0,									STR_983D_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0,									STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_983C_REFIT_SHIP,	STR_983E_REFIT_SHIP_TO_CARRY_HIGHLIGHTED},
 {   WIDGETS_END},
 };
 static const WindowDesc _ship_refit_desc = {
@@ @@ -270,15 +270,15 @@ change_int: @@
 static const Widget _ship_details_widgets[] = {
-{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   364,     0,    13, STR_9811_DETAILS,STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   365,   404,     0,    13, STR_01AA_NAME, STR_982F_NAME_SHIP},
 {     WWT_IMGBTN,    14,     0,   404,    14,    55, 0x0},
 {     WWT_IMGBTN,    14,     0,   404,    56,    88, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,    10,    89,    94, STR_0188,STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    95,   100, STR_0189,STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   404,    89,   100, 0x0},
 {      WWT_LAST},
 { WWT_PUSHTXTBTN,    14,   365,   404,     0,    13, STR_01AA_NAME,		STR_982F_NAME_SHIP},
 {     WWT_IMGBTN,    14,     0,   404,    14,    55, 0x0,							STR_NULL},
 {     WWT_IMGBTN,    14,     0,   404,    56,    88, 0x0,							STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    89,    94, STR_0188,				STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,    95,   100, STR_0189,				STR_884E_DECREASE_SERVICING_INTERVAL},
 {     WWT_IMGBTN,    14,    11,   404,    89,   100, 0x0,							STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _ship_details_desc = {
@@ @@ -428,14 +428,14 @@ static void NewShipWndProc(Window *w, Wi @@
+}
 static const Widget _new_ship_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   254,     0,    13, STR_9808_NEW_SHIPS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   243,    14,   109, 0x401, STR_9825_SHIP_SELECTION_LIST_CLICK},
 {  WWT_SCROLLBAR,    14,   244,   254,    14,   109, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   254,   110,   161, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,   126,   162,   173, STR_9809_BUILD_SHIP, STR_9826_BUILD_THE_HIGHLIGHTED_SHIP},
 { WWT_PUSHTXTBTN,    14,   127,   254,   162,   173, STR_9836_RENAME, STR_9837_RENAME_SHIP_TYPE},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,						STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   254,     0,    13, STR_9808_NEW_SHIPS,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   243,    14,   109, 0x401,								STR_9825_SHIP_SELECTION_LIST_CLICK},
 {  WWT_SCROLLBAR,    14,   244,   254,    14,   109, 0x0,									STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   254,   110,   161, 0x0,									STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   126,   162,   173, STR_9809_BUILD_SHIP,	STR_9826_BUILD_THE_HIGHLIGHTED_SHIP},
 { WWT_PUSHTXTBTN,    14,   127,   254,   162,   173, STR_9836_RENAME,			STR_9837_RENAME_SHIP_TYPE},
 {   WIDGETS_END},
 };
 static const WindowDesc _new_ship_desc = {
@@ @@ -564,17 +564,17 @@ static void ShipViewWndProc(Window *w, W @@
+}
 static const Widget _ship_view_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_980F, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0},
 {          WWT_6,    14,     2,   229,    16,   101, 0},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0, STR_9827_CURRENT_SHIP_ACTION_CLICK},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB, STR_9829_CENTER_MAIN_VIEW_ON_SHIP},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2B0, STR_982A_SEND_SHIP_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B4, STR_983A_REFIT_CARGO_SHIP_TO_CARRY},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2, STR_9828_SHOW_SHIP_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3, STR_982B_SHOW_SHIP_DETAILS},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_980F,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0,				STR_NULL},
 {          WWT_6,    14,     2,   229,    16,   101, 0x0,				STR_NULL},
 { WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0,				STR_9827_CURRENT_SHIP_ACTION_CLICK},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB,			STR_9829_CENTER_MAIN_VIEW_ON_SHIP},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2B0,			STR_982A_SEND_SHIP_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B4,			STR_983A_REFIT_CARGO_SHIP_TO_CARRY},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2,			STR_9828_SHOW_SHIP_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3,			STR_982B_SHOW_SHIP_DETAILS},
 {   WIDGETS_END},
 };
 static const WindowDesc _ship_view_desc = {
@@ @@ -809,7 +809,7 @@ static const Widget _ship_depot_widgets[ @@
 {  WWT_SCROLLBAR,    14,   294,   304,    14,    61, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   151,    62,    73, STR_9804_NEW_SHIPS, STR_9820_BUILD_NEW_SHIP},
 { WWT_PUSHTXTBTN,    14,   152,   304,    62,    73, STR_00E4_LOCATION, STR_9822_CENTER_MAIN_VIEW_ON_SHIP},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _ship_depot_desc = {
@@ @@ -1082,14 +1082,14 @@ static const Widget _player_ships_widget @@
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   259,     0,    13, STR_9805_SHIPS,				STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,						STR_SORT_TIP},
-{      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										STR_NULL},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,							STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   169, 0x401,									STR_9823_SHIPS_CLICK_ON_SHIP_FOR},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   169, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   129,   170,   181, STR_9804_NEW_SHIPS,		STR_9824_BUILD_NEW_SHIPS_REQUIRES},
 {      WWT_PANEL,    14,   130,   259,   170,   181, 0x0,										0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,   130,   259,   170,   181, 0x0,										STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _player_ships_desc = {
@@ @@ -1104,12 +1104,12 @@ static const Widget _other_player_ships_ @@
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   259,     0,    13, STR_9805_SHIPS,				STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,						STR_SORT_TIP},
-{      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,    81,   237,    14,    25, 0x0,										STR_NULL},
 {   WWT_CLOSEBOX,    14,   238,   248,    14,    25, STR_0225,							STR_SORT_TIP},
-{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   249,   259,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   248,    26,   169, 0x401,									STR_9823_SHIPS_CLICK_ON_SHIP_FOR},
 {  WWT_SCROLLBAR,    14,   249,   259,    26,   169, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _other_player_ships_desc = {

smallmap_gui.c

➞

Show inline comments

@@ @@ -9,57 +9,57 @@ @@
 #include "town.h"
 static const Widget _smallmap_megabig_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   592,     0,    13, STR_00B0_MAP,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,   593,   606,     0,    13, 0x2AA,STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   606,    14,   407, 0x0, 0},
 {          WWT_6,    13,     2,   604,    16,   405, 0x0, 0},
 {     WWT_IMGBTN,    13,   541,   562,   408,   429, 0x2E2,STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   563,   584,   408,   429, 0x2E3,STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   585,   606,   408,   429, 0x2E5,STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   519,   540,   430,   451, 0x2E4,STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   541,   562,   430,   451, 0x2E6,STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   563,   584,   430,   451, 0x2E7,STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   585,   606,   430,   451, 0xFED,STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   518,   408,   451, 0x0,STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,   519,   540,   408,   429, 0x0,0},
 {      WWT_LAST},
 {     WWT_IMGBTN,    13,   593,   606,     0,    13, 0x2AA,				STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   606,    14,   407, 0x0,					STR_NULL},
 {          WWT_6,    13,     2,   604,    16,   405, 0x0,					STR_NULL},
 {     WWT_IMGBTN,    13,   541,   562,   408,   429, 0x2E2,				STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   563,   584,   408,   429, 0x2E3,				STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   585,   606,   408,   429, 0x2E5,				STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   519,   540,   430,   451, 0x2E4,				STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   541,   562,   430,   451, 0x2E6,				STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   563,   584,   430,   451, 0x2E7,				STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   585,   606,   430,   451, 0xFED,				STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   518,   408,   451, 0x0,					STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,   519,   540,   408,   429, 0x0,					STR_NULL},
 {   WIDGETS_END},
 };
 static const Widget _smallmap_big_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   431,     0,    13, STR_00B0_MAP,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,   432,   445,     0,    13, 0x2AA,STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   445,    14,   257, 0x0, 0},
 {          WWT_6,    13,     2,   443,    16,   255, 0x0, 0},
 {     WWT_IMGBTN,    13,   380,   401,   258,   279, 0x2E2,STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   402,   423,   258,   279, 0x2E3,STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   424,   445,   258,   279, 0x2E5,STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   380,   401,   280,   301, 0x2E4,STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   402,   423,   280,   301, 0x2E6,STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   424,   445,   280,   301, 0x2E7,STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   358,   379,   280,   301, 0xFED,STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   357,   258,   301, 0x0,STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,   358,   379,   258,   279, 0x0,0},
 {      WWT_LAST},
 {     WWT_IMGBTN,    13,   432,   445,     0,    13, 0x2AA,				STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   445,    14,   257, 0x0,					STR_NULL},
 {          WWT_6,    13,     2,   443,    16,   255, 0x0,					STR_NULL},
 {     WWT_IMGBTN,    13,   380,   401,   258,   279, 0x2E2,				STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   402,   423,   258,   279, 0x2E3,				STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   424,   445,   258,   279, 0x2E5,				STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   380,   401,   280,   301, 0x2E4,				STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   402,   423,   280,   301, 0x2E6,				STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   424,   445,   280,   301, 0x2E7,				STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   358,   379,   280,   301, 0xFED,				STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   357,   258,   301, 0x0,					STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,   358,   379,   258,   279, 0x0,					STR_NULL},
 {   WIDGETS_END},
 };
 static const Widget _smallmap_small_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   233,     0,    13, STR_00B0_MAP,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,   234,   247,     0,    13, 0x2AA,STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   225,    14,   167, 0x0, 0},
 {          WWT_6,    13,     2,   223,    16,   165, 0x0, 0},
 {     WWT_IMGBTN,    13,   226,   247,    14,    35, 0x2E2,STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    36,    57, 0x2E3,STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    58,    79, 0x2E5,STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    80,   101, 0x2E4,STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   226,   247,   102,   123, 0x2E6,STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,   124,   145, 0x2E7,STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,   146,   167, 0xFED,STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   247,   168,   211, 0x0,0},
 {      WWT_LAST},
 {     WWT_IMGBTN,    13,   234,   247,     0,    13, 0x2AA,				STR_01CC_TOGGLE_LARGE_SMALL_MAP},
 {     WWT_IMGBTN,    13,     0,   225,    14,   167, 0x0,					STR_NULL},
 {          WWT_6,    13,     2,   223,    16,   165, 0x0,					STR_NULL},
 {     WWT_IMGBTN,    13,   226,   247,    14,    35, 0x2E2,				STR_0191_SHOW_LAND_CONTOURS_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    36,    57, 0x2E3,				STR_0192_SHOW_VEHICLES_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    58,    79, 0x2E5,				STR_0193_SHOW_INDUSTRIES_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,    80,   101, 0x2E4,				STR_0194_SHOW_TRANSPORT_ROUTES_ON},
 {     WWT_IMGBTN,    13,   226,   247,   102,   123, 0x2E6,				STR_0195_SHOW_VEGETATION_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,   124,   145, 0x2E7,				STR_0196_SHOW_LAND_OWNERS_ON_MAP},
 {     WWT_IMGBTN,    13,   226,   247,   146,   167, 0xFED,				STR_0197_TOGGLE_TOWN_NAMES_ON_OFF},
 {     WWT_IMGBTN,    13,     0,   247,   168,   211, 0x0,					STR_NULL},
 {   WIDGETS_END},
 };
 static int _smallmap_type;
@@ @@ -999,15 +999,15 @@ void ShowSmallMap() @@
 /* Extra ViewPort Window Stuff */
 static Widget _extra_view_port_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   299,     0,    13, STR_EXTRA_VIEW_PORT_TITLE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   299,    14,   233, 0x0, 0},
 {          WWT_6,    14,     2,   297,    16,   231, 0, 0},
 {      WWT_PANEL,    14,     0,    21,   234,   255, 0x2DF, STR_017F_ZOOM_THE_VIEW_IN},
 {      WWT_PANEL,    14,    22,    43,   234,   255, 0x2E0, STR_0180_ZOOM_THE_VIEW_OUT},
 { WWT_PUSHTXTBTN,    14,    44,   171,   234,   255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT},
 { WWT_PUSHTXTBTN,    14,   172,   299,   234,   255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   299,     0,    13, STR_EXTRA_VIEW_PORT_TITLE,				STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   299,    14,   233, 0x0,				STR_NULL},
 {          WWT_6,    14,     2,   297,    16,   231, 0x0,				STR_NULL},
 {      WWT_PANEL,    14,     0,    21,   234,   255, 0x2DF,			STR_017F_ZOOM_THE_VIEW_IN},
 {      WWT_PANEL,    14,    22,    43,   234,   255, 0x2E0,			STR_0180_ZOOM_THE_VIEW_OUT},
 { WWT_PUSHTXTBTN,    14,    44,   171,   234,   255, STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW,STR_EXTRA_VIEW_MOVE_MAIN_TO_VIEW_TT},
 { WWT_PUSHTXTBTN,    14,   172,   299,   234,   255, STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN,STR_EXTRA_VIEW_MOVE_VIEW_TO_MAIN_TT},
 {   WIDGETS_END},
 };
 static void ExtraViewPortWndProc(Window *w, WindowEvent *e)

station_gui.c

➞

Show inline comments

@@ @@ -219,7 +219,7 @@ static const Widget _player_stations_wid @@
 {    WWT_CAPTION,    14,    11,   357,     0,    13, STR_3048_STATIONS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   346,    14,   137, 0x0, STR_3057_STATION_NAMES_CLICK_ON},
 {  WWT_SCROLLBAR,    14,   347,   357,    14,   137, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _player_stations_desc = {
@@ @@ -243,29 +243,29 @@ void ShowPlayerStations(int player) @@
+}
 static const Widget _station_view_expanded_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   248,     0,    13, STR_300A_0, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   237,    14,    65, 0x0, 0},
 {  WWT_SCROLLBAR,    14,   238,   248,    14,    65, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 {     WWT_IMGBTN,    14,     0,   248,    66,   197, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,    82,   198,   209, STR_00E4_LOCATION, STR_3053_CENTER_MAIN_VIEW_ON_STATION},
 { WWT_PUSHTXTBTN,    14,    83,   165,   198,   209, STR_3033_ACCEPTS, STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO},
 { WWT_PUSHTXTBTN,    14,   166,   248,   198,   209, STR_0130_RENAME, STR_3055_CHANGE_NAME_OF_STATION},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   248,     0,    13, STR_300A_0,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   237,    14,    65, 0x0,					STR_NULL},
 {  WWT_SCROLLBAR,    14,   238,   248,    14,    65, 0x0,					STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 {     WWT_IMGBTN,    14,     0,   248,    66,   197, 0x0,					STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    82,   198,   209, STR_00E4_LOCATION,	STR_3053_CENTER_MAIN_VIEW_ON_STATION},
 { WWT_PUSHTXTBTN,    14,    83,   165,   198,   209, STR_3033_ACCEPTS,	STR_3056_SHOW_LIST_OF_ACCEPTED_CARGO},
 { WWT_PUSHTXTBTN,    14,   166,   248,   198,   209, STR_0130_RENAME,		STR_3055_CHANGE_NAME_OF_STATION},
 {   WIDGETS_END},
 };
 static const Widget _station_view_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   248,     0,    13, STR_300A_0, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   237,    14,    65, 0x0, 0},
 {  WWT_SCROLLBAR,    14,   238,   248,    14,    65, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   248,    66,    97, 0x0, 0},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,    82,    98,   109, STR_00E4_LOCATION, STR_3053_CENTER_MAIN_VIEW_ON_STATION},
 { WWT_PUSHTXTBTN,    14,    83,   165,    98,   109, STR_3032_RATINGS, STR_3054_SHOW_STATION_RATINGS},
 { WWT_PUSHTXTBTN,    14,   166,   248,    98,   109, STR_0130_RENAME, STR_3055_CHANGE_NAME_OF_STATION},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,		STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   248,     0,    13, STR_300A_0,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   237,    14,    65, 0x0,					STR_NULL},
 {  WWT_SCROLLBAR,    14,   238,   248,    14,    65, 0x0,					STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    14,     0,   248,    66,    97, 0x0,					STR_NULL},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,					STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    82,    98,   109, STR_00E4_LOCATION,	STR_3053_CENTER_MAIN_VIEW_ON_STATION},
 { WWT_PUSHTXTBTN,    14,    83,   165,    98,   109, STR_3032_RATINGS,	STR_3054_SHOW_STATION_RATINGS},
 { WWT_PUSHTXTBTN,    14,   166,   248,    98,   109, STR_0130_RENAME,		STR_3055_CHANGE_NAME_OF_STATION},
 {   WIDGETS_END},
 };
 static void DrawStationViewWindow(Window *w)

subsidy_gui.c

➞

Show inline comments

@@ @@ -146,7 +146,7 @@ static const Widget _subsidies_list_widg @@
 {   WWT_CLOSEBOX,    13,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   629,     0,    13, STR_2025_SUBSIDIES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    13,     0,   629,    14,   126, 0x0, STR_01FD_CLICK_ON_SERVICE_TO_CENTER},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _subsidies_list_desc = {

terraform_gui.c

➞

Show inline comments

@@ @@ -183,20 +183,19 @@ static void TerraformToolbWndProc(Window @@
+}
 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_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_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,    0, 0x0},
 {    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,   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_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _terraform_desc = {

town_gui.c

➞

Show inline comments

@@ @@ -9,14 +9,14 @@ @@
 #include "player.h"
 static const Widget _town_authority_widgets[] = {
-{    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   316,     0,    13, STR_2022_LOCAL_AUTHORITY, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,     0,   316,    14,   105, 0x0, 0},
 {     WWT_IMGBTN,    13,     0,   305,   106,   157, 0x0, STR_2043_LIST_OF_THINGS_TO_DO_AT},
 {  WWT_SCROLLBAR,    13,   306,   316,   106,   157, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    13,     0,   316,   158,   209, 0x0, 0},
 { WWT_PUSHTXTBTN,    13,     0,   316,   210,   221, STR_2042_DO_IT, STR_2044_CARRY_OUT_THE_HIGHLIGHTED},
 {      WWT_LAST},
 {     WWT_IMGBTN,    13,     0,   316,    14,   105, 0x0,							STR_NULL},
 {     WWT_IMGBTN,    13,     0,   305,   106,   157, 0x0,							STR_2043_LIST_OF_THINGS_TO_DO_AT},
 {  WWT_SCROLLBAR,    13,   306,   316,   106,   157, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {     WWT_IMGBTN,    13,     0,   316,   158,   209, 0x0,							STR_NULL},
 { WWT_PUSHTXTBTN,    13,     0,   316,   210,   221, STR_2042_DO_IT,	STR_2044_CARRY_OUT_THE_HIGHLIGHTED},
 {   WIDGETS_END},
 };
 extern const byte _town_action_costs[8];
@@ @@ -276,13 +276,13 @@ static void TownViewWndProc(Window *w, W @@
 static const Widget _town_view_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   259,     0,    13, STR_2005, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,     0,   259,    14,   105, 0x0,      0},
 {          WWT_6,    13,     2,   257,    16,   103, 0x0,      0},
 {     WWT_IMGBTN,    13,     0,   259,   106,   137, 0x0,      0},
 { WWT_PUSHTXTBTN,    13,     0,    85,   138,   149, STR_00E4_LOCATION, STR_200B_CENTER_THE_MAIN_VIEW_ON},
 { WWT_PUSHTXTBTN,    13,    86,   171,   138,   149, STR_2020_LOCAL_AUTHORITY, STR_2021_SHOW_INFORMATION_ON_LOCAL},
 { WWT_PUSHTXTBTN,    13,   172,   259,   138,   149, STR_0130_RENAME, STR_200C_CHANGE_TOWN_NAME},
 {      WWT_LAST},
 {     WWT_IMGBTN,    13,     0,   259,    14,   105, 0x0,      STR_NULL},
 {          WWT_6,    13,     2,   257,    16,   103, 0x0,      STR_NULL},
 {     WWT_IMGBTN,    13,     0,   259,   106,   137, 0x0,      STR_NULL},
 { WWT_PUSHTXTBTN,    13,     0,    85,   138,   149, STR_00E4_LOCATION,				STR_200B_CENTER_THE_MAIN_VIEW_ON},
 { WWT_PUSHTXTBTN,    13,    86,   171,   138,   149, STR_2020_LOCAL_AUTHORITY,STR_2021_SHOW_INFORMATION_ON_LOCAL},
 { WWT_PUSHTXTBTN,    13,   172,   259,   138,   149, STR_0130_RENAME,					STR_200C_CHANGE_TOWN_NAME},
 {   WIDGETS_END},
 };
 static const WindowDesc _town_view_desc = {
@@ @@ -294,17 +294,17 @@ static const WindowDesc _town_view_desc @@
 };
 static const Widget _town_view_scen_widgets[] = {
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   184,     0,    13, STR_2005, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,     0,   259,    14,   105, 0x0},
 {          WWT_6,    13,     2,   257,    16,   103, 0x0},
 {     WWT_IMGBTN,    13,     0,   259,   106,   137, 0x0},
 { WWT_PUSHTXTBTN,    13,     0,    85,   138,   149, STR_00E4_LOCATION, STR_200B_CENTER_THE_MAIN_VIEW_ON},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0},
 { WWT_PUSHTXTBTN,    13,   185,   259,     0,    13, STR_0130_RENAME, STR_200C_CHANGE_TOWN_NAME},
 { WWT_PUSHTXTBTN,    13,    86,   171,   138,   149, STR_023C_EXPAND, STR_023B_INCREASE_SIZE_OF_TOWN},
 { WWT_PUSHTXTBTN,    13,   172,   259,   138,   149, STR_0290_DELETE, STR_0291_DELETE_THIS_TOWN_COMPLETELY},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    13,     0,    10,     0,    13, STR_00C5,					STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    13,    11,   184,     0,    13, STR_2005,					STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    13,     0,   259,    14,   105, 0x0,								STR_NULL},
 {          WWT_6,    13,     2,   257,    16,   103, 0x0,								STR_NULL},
 {     WWT_IMGBTN,    13,     0,   259,   106,   137, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    13,     0,    85,   138,   149, STR_00E4_LOCATION,	STR_200B_CENTER_THE_MAIN_VIEW_ON},
 {      WWT_EMPTY,     0,     0,     0,     0,     0, 0x0,								STR_NULL},
 { WWT_PUSHTXTBTN,    13,   185,   259,     0,    13, STR_0130_RENAME,		STR_200C_CHANGE_TOWN_NAME},
 { WWT_PUSHTXTBTN,    13,    86,   171,   138,   149, STR_023C_EXPAND,		STR_023B_INCREASE_SIZE_OF_TOWN},
 { WWT_PUSHTXTBTN,    13,   172,   259,   138,   149, STR_0290_DELETE,		STR_0291_DELETE_THIS_TOWN_COMPLETELY},
 {   WIDGETS_END},
 };
 static const WindowDesc _town_view_scen_desc = {
@@ @@ -340,7 +340,7 @@ static const Widget _town_directory_widg @@
 { WWT_PUSHTXTBTN,    13,    99,   196,    14,    25, STR_SORT_BY_POPULATION,STR_SORT_TIP},
 {     WWT_IMGBTN,    13,     0,   196,    26,   189, 0x0, STR_200A_TOWN_NAMES_CLICK_ON_NAME},
 {  WWT_SCROLLBAR,    13,   197,   207,    14,   189, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };

train_gui.c

➞

Show inline comments

@@ @@ -209,14 +209,14 @@ static void NewRailVehicleWndProc(Window @@
+}
 static const Widget _new_rail_vehicle_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   227,     0,    13, STR_0315, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   216,    14,   125, 0x801, STR_8843_TRAIN_VEHICLE_SELECTION},
 {  WWT_SCROLLBAR,    14,   217,   227,    14,   125, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_PANEL,    14,     0,   227,   126,   187, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,   113,   188,   199, STR_881F_BUILD_VEHICLE, STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN},
 { WWT_PUSHTXTBTN,    14,   114,   227,   188,   199, STR_8820_RENAME, STR_8845_RENAME_TRAIN_VEHICLE_TYPE},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,	STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   227,     0,    13, STR_0315,	STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_MATRIX,    14,     0,   216,    14,   125, 0x801,			STR_8843_TRAIN_VEHICLE_SELECTION},
 {  WWT_SCROLLBAR,    14,   217,   227,    14,   125, 0x0,				STR_0190_SCROLL_BAR_SCROLLS_LIST},
 {      WWT_PANEL,    14,     0,   227,   126,   187, 0x0,				STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   113,   188,   199, STR_881F_BUILD_VEHICLE,	STR_8844_BUILD_THE_HIGHLIGHTED_TRAIN},
 { WWT_PUSHTXTBTN,    14,   114,   227,   188,   199, STR_8820_RENAME,					STR_8845_RENAME_TRAIN_VEHICLE_TYPE},
 {   WIDGETS_END},
 };
 static const WindowDesc _new_rail_vehicle_desc = {
@@ @@ -569,7 +569,7 @@ static const Widget _train_depot_widgets @@
 { WWT_PUSHTXTBTN,    14,     0,   173,    109,  120, STR_8815_NEW_VEHICLES,	STR_8840_BUILD_NEW_TRAIN_VEHICLE},
 { WWT_PUSHTXTBTN,    14,   174,   348,    109,  120, STR_00E4_LOCATION,			STR_8842_CENTER_MAIN_VIEW_ON_TRAIN},
 { WWT_HSCROLLBAR,    14,     0,   313,    98,   108, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _train_depot_desc = {
@@ @@ -672,12 +672,12 @@ static void RailVehicleRefitWndProc(Wind @@
 static const Widget _rail_vehicle_refit_widgets[] = {
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_983B_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0, STR_RAIL_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0},
 { WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_RAIL_REFIT_VEHICLE, STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED},
 {      WWT_LAST},
 {    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5,							STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   239,     0,    13, STR_983B_REFIT,				STR_018C_WINDOW_TITLE_DRAG_THIS},
 {     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0,										STR_RAIL_SELECT_TYPE_OF_CARGO_FOR},
 {     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0,										STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_RAIL_REFIT_VEHICLE,STR_RAIL_REFIT_TO_CARRY_HIGHLIGHTED},
 {   WIDGETS_END},
 };
 static const WindowDesc _rail_vehicle_refit_desc = {
@@ @@ -700,19 +700,19 @@ static void ShowRailVehicleRefitWindow(V @@
+}
 static Widget _train_view_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_882E, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   231,    14,   121, 0x0, 0},
 {          WWT_6,    14,     2,   229,    16,   119, 0, 0},
 { WWT_PUSHIMGBTN,    14,     0,   249,   122,   133, 0x0, STR_8846_CURRENT_TRAIN_ACTION_CLICK},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB, STR_8848_CENTER_MAIN_VIEW_ON_TRAIN},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AD, STR_8849_SEND_TRAIN_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B1, STR_884A_FORCE_TRAIN_TO_PROCEED},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2CB, STR_884B_REVERSE_DIRECTION_OF_TRAIN},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B2, STR_8847_SHOW_TRAIN_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,   104,   121, 0x2B3, STR_884C_SHOW_TRAIN_DETAILS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B4, STR_RAIL_REFIT_VEHICLE_TO_CARRY},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   249,     0,    13, STR_882E,STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,    14,     0,   231,    14,   121, 0x0,			STR_NULL},
 {          WWT_6,    14,     2,   229,    16,   119, 0x0,			STR_NULL},
 { WWT_PUSHIMGBTN,    14,     0,   249,   122,   133, 0x0,			STR_8846_CURRENT_TRAIN_ACTION_CLICK},
 { WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB,		STR_8848_CENTER_MAIN_VIEW_ON_TRAIN},
 { WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AD,		STR_8849_SEND_TRAIN_TO_DEPOT},
 { WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B1,		STR_884A_FORCE_TRAIN_TO_PROCEED},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2CB,		STR_884B_REVERSE_DIRECTION_OF_TRAIN},
 { WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B2,		STR_8847_SHOW_TRAIN_S_ORDERS},
 { WWT_PUSHIMGBTN,    14,   232,   249,   104,   121, 0x2B3,		STR_884C_SHOW_TRAIN_DETAILS},
 { WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B4,		STR_RAIL_REFIT_VEHICLE_TO_CARRY},
 {   WIDGETS_END},
 };
 static void TrainViewWndProc(Window *w, WindowEvent *e)
@@ @@ -1093,20 +1093,20 @@ do_change_service_int: @@
+}
 static const Widget _train_details_widgets[] = {
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   329,     0,    13, STR_8802_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   330,   369,     0,    13, STR_01AA_NAME, STR_8867_NAME_TRAIN},
 {      WWT_PANEL,    14,     0,   369,    14,    55, 0x0, 0},
 {     WWT_MATRIX,    14,     0,   358,    56,   139, 0x601, 0},
 {  WWT_SCROLLBAR,    14,   359,   369,    56,   139, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    10,   140,   145, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,   146,   151, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL},
 {      WWT_PANEL,    14,    11,   369,   140,   151, 0x0, 0},
 { WWT_PUSHTXTBTN,    14,     0,    92,   152,   163, STR_013C_CARGO, STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED},
 { WWT_PUSHTXTBTN,    14,    93,   184,   152,   163, STR_013D_INFORMATION, STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES},
 { WWT_PUSHTXTBTN,    14,   185,   277,   152,   163, STR_013E_CAPACITIES, STR_8851_SHOW_CAPACITIES_OF_EACH},
 { WWT_PUSHTXTBTN,    14,   278,   369,   152,   163, STR_013E_TOTAL_CARGO, STR_8852_SHOW_TOTAL_CARGO},
 {      WWT_LAST},
 {   WWT_CLOSEBOX,    14,     0,    10,     0,    13, STR_00C5,				STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,    14,    11,   329,     0,    13, STR_8802_DETAILS,STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,    14,   330,   369,     0,    13, STR_01AA_NAME,		STR_8867_NAME_TRAIN},
 {      WWT_PANEL,    14,     0,   369,    14,    55, 0x0,							STR_NULL},
 {     WWT_MATRIX,    14,     0,   358,    56,   139, 0x601,						STR_NULL},
 {  WWT_SCROLLBAR,    14,   359,   369,    56,   139, 0x0,							STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,    10,   140,   145, STR_0188,				STR_884D_INCREASE_SERVICING_INTERVAL},
 { WWT_PUSHTXTBTN,    14,     0,    10,   146,   151, STR_0189,				STR_884E_DECREASE_SERVICING_INTERVAL},
 {      WWT_PANEL,    14,    11,   369,   140,   151, 0x0,							STR_NULL},
 { WWT_PUSHTXTBTN,    14,     0,    92,   152,   163, STR_013C_CARGO,	STR_884F_SHOW_DETAILS_OF_CARGO_CARRIED},
 { WWT_PUSHTXTBTN,    14,    93,   184,   152,   163, STR_013D_INFORMATION,	STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES},
 { WWT_PUSHTXTBTN,    14,   185,   277,   152,   163, STR_013E_CAPACITIES,		STR_8851_SHOW_CAPACITIES_OF_EACH},
 { WWT_PUSHTXTBTN,    14,   278,   369,   152,   163, STR_013E_TOTAL_CARGO,	STR_8852_SHOW_TOTAL_CARGO},
 {   WIDGETS_END},
 };
@@ @@ -1350,12 +1350,12 @@ static const Widget _player_trains_widge @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,           STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   232,    14,    25, 0x0,			              STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   233,   243,    14,    25, STR_0225,              STR_SORT_TIP},
-{      WWT_PANEL,    14,   244,   324,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   244,   324,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   313,    26,   207, 0x701,									STR_883D_TRAINS_CLICK_ON_TRAIN_FOR},
 {  WWT_SCROLLBAR,    14,   314,   324,    26,   207, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
 { WWT_PUSHTXTBTN,    14,     0,   161,   208,   219, STR_8815_NEW_VEHICLES,	STR_883E_BUILD_NEW_TRAINS_REQUIRES},
 {      WWT_PANEL,    14,   162,   324,   208,   219, 0x0,										0},
 {      WWT_LAST},
 {      WWT_PANEL,    14,   162,   324,   208,   219, 0x0,										STR_NULL},
 {   WIDGETS_END},
 };
 static const WindowDesc _player_trains_desc = {
@@ @@ -1372,10 +1372,10 @@ static const Widget _other_player_trains @@
 { WWT_PUSHTXTBTN,    14,     0,    80,    14,    25, SRT_SORT_BY,           STR_SORT_TIP},
 {      WWT_PANEL,    14,    81,   232,    14,    25, 0x0,										STR_SORT_TIP},
 {   WWT_CLOSEBOX,    14,   233,   243,    14,    25, STR_0225,              STR_SORT_TIP},
-{      WWT_PANEL,    14,   244,   324,    14,    25, 0x0,										0},
+{      WWT_PANEL,    14,   244,   324,    14,    25, 0x0,										STR_NULL},
 {     WWT_MATRIX,    14,     0,   313,    26,   207, 0x701,									STR_883D_TRAINS_CLICK_ON_TRAIN_FOR},
 {  WWT_SCROLLBAR,    14,   314,   324,    26,   207, 0x0,										STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_LAST},
+{   WIDGETS_END},
 };
 static const WindowDesc _other_player_trains_desc = {

widget.c

➞

Show inline comments

@@ @@ -385,8 +385,8 @@ static byte _dropdown_var1; @@
 static byte _dropdown_var2;
 static Widget _dropdown_menu_widgets[] = {
 {     WWT_IMGBTN,     0,     0, 0,     0, 0, 0x0},
 {      WWT_LAST},
 {     WWT_IMGBTN,     0,     0, 0,     0, 0, 0x0, STR_NULL},
 {   WIDGETS_END},
 };
 static int GetDropdownItem(Window *w)

window.h

➞

Show inline comments

@@ @@ -315,30 +315,32 @@ enum WindowWidgetBehaviours { @@
 enum WindowWidgetTypes {
 	WWT_EMPTY = 0,
-	WWT_IMGBTN = 1, /* button with image */
+	WWT_IMGBTN = 1,						/* button with image */
 	WWT_PANEL = WWT_IMGBTN,
 	WWT_PANEL_2 = 2,/* button with diff image when clicked */
+	WWT_PANEL_2 = 2,					/* button with diff image when clicked */
 	WWT_TEXTBTN = 3,/* button with text */
+	WWT_TEXTBTN = 3,					/* button with text */
 	WWT_CLOSEBOX = WWT_TEXTBTN,
 	WWT_4 = 4, /* button with diff text when clicked */
 	WWT_5 = 5, /* label */
 	WWT_6 = 6, /* combo box text area */
 	WWT_4 = 4,								/* button with diff text when clicked */
 	WWT_5 = 5,								/* label */
 	WWT_6 = 6,								/* combo box text area */
 	WWT_MATRIX = 7,
 	WWT_SCROLLBAR = 8,
-	WWT_FRAME = 9, /* frame */
+	WWT_FRAME = 9,						/* frame */
 	WWT_CAPTION = 10,
 	WWT_HSCROLLBAR = 11,
 	WWT_LAST = 12,
+	WWT_LAST = 12,						/* Last Item. use WIDGETS_END to fill up padding!! */
 	WWT_MASK = 31,
 	WWT_PUSHTXTBTN = WWT_TEXTBTN | WWB_PUSHBUTTON,
 	WWT_PUSHIMGBTN = WWT_IMGBTN | WWB_PUSHBUTTON,
 	WWT_NODISTXTBTN = WWT_TEXTBTN | WWB_NODISBUTTON,
 	WWT_PUSHTXTBTN	= WWT_TEXTBTN	| WWB_PUSHBUTTON,
 	WWT_PUSHIMGBTN	= WWT_IMGBTN	| WWB_PUSHBUTTON,
 	WWT_NODISTXTBTN = WWT_TEXTBTN	| WWB_NODISBUTTON,
 };
 #define WIDGETS_END WWT_LAST,     0,     0,     0,     0,     0, 0, STR_NULL
 enum WindowFlags {
 	WF_TIMEOUT_SHL = 0,
 	WF_TIMEOUT_MASK = 7,

0 comments (0 inline, 0 general)