--- a/smallmap_gui.c Tue Sep 07 19:34:55 2004 +0000
+++ b/smallmap_gui.c Tue Sep 07 21:48:09 2004 +0000
@@ -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 @@
/* 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)