openttd-ottdgrfs: comparison src/settings

equal deleted inserted replaced

-:2ffe947969ca
+:a2f86b8fd99b
 }
 static void ShowCustCurrency(void);
-static void GameOptionsWndProc(Window *w, WindowEvent *e)
+static void GameOptionsWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT: {
 		int i;
 		StringID str = STR_02BE_DEFAULT;
 		InvalidateWindow(WC_GAME_OPTIONS,0);
 	}
 	return 0;
 }
-static const Widget _game_options_widgets[] = {
+static const OldWidget _game_options_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   369,     0,    13, STR_00B1_GAME_OPTIONS,             STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   369,    14,   238, 0x0,                               STR_NULL},
 {      WWT_FRAME,   RESIZE_NONE,    14,    10,   179,    20,    55, STR_02E0_CURRENCY_UNITS,           STR_NULL},
 {      WWT_INSET,   RESIZE_NONE,    14,    20,   169,    34,    45, STR_02E1,                          STR_02E2_CURRENCY_UNITS_SELECTION},
 void ShowGameOptions(void)
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
-	AllocateWindowDesc(&_game_options_desc);
+	BaseWindow::Allocate(&_game_options_desc);
 }
 typedef struct {
 	int16 min;
 	int16 max;
 // Temporary holding place of values in the difficulty window until 'Save' is clicked
 static GameOptions _opt_mod_temp;
 // 0x383E = (1 << 13) | (1 << 12) | (1 << 11) | (1 << 5) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1)
 #define DIFF_INGAME_DISABLED_BUTTONS 0x383E
-static void GameDifficultyWndProc(Window *w, WindowEvent *e)
+static void GameDifficultyWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_CREATE: // Setup disabled buttons when creating window
 		/* disable all other difficulty buttons during gameplay except for 'custom' */
 		w->SetWidgetDisabledState( 3, _game_mode == GM_NORMAL);
 	}
 }
 #undef DIFF_INGAME_DISABLED_BUTTONS
-static const Widget _game_difficulty_widgets[] = {
+static const OldWidget _game_difficulty_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    10,     0,    10,     0,    13, STR_00C5,                     STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    10,    11,   369,     0,    13, STR_6800_DIFFICULTY_LEVEL,    STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    10,     0,   369,    14,    29, 0x0,                          STR_NULL},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,     3,    10,    96,    16,    27, STR_6801_EASY,                STR_NULL},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,     3,    97,   183,    16,    27, STR_6802_MEDIUM,              STR_NULL},
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
 	/* Copy current settings (ingame or in intro) to temporary holding place
 	 * change that when setting stuff, copy back on clicking 'OK' */
 	_opt_mod_temp = *_opt_ptr;
-	AllocateWindowDesc(&_game_difficulty_desc);
+	BaseWindow::Allocate(&_game_difficulty_desc);
 }
 static const char *_patches_ui[] = {
 	"vehicle_speed",
 	"status_long_date",
 };
 /** The main patches window. Shows a number of categories on top and
 * a selection of patches in that category.
 * Uses WP(w, def_d) macro - data_1, data_2, data_3 */
-static void PatchesSelectionWndProc(Window *w, WindowEvent *e)
+static void PatchesSelectionWndProc(BaseWindow *w, WindowEvent *e)
 {
 	static Patches *patches_ptr;
 	switch (e->event) {
 	case WE_CREATE: {
 		DeleteWindowById(WC_QUERY_STRING, 0);
 		break;
 	}
 }
-static const Widget _patches_selection_widgets[] = {
+static const OldWidget _patches_selection_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    10,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    10,    11,   369,     0,    13, STR_CONFIG_PATCHES_CAPTION,      STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    10,     0,   369,    14,    41, 0x0,                             STR_NULL},
 {      WWT_PANEL,   RESIZE_NONE,    10,     0,   369,    42,   370, 0x0,                             STR_NULL},
 };
 void ShowPatchesSelection(void)
 {
 	DeleteWindowById(WC_GAME_OPTIONS, 0);
-	AllocateWindowDesc(&_patches_selection_desc);
+	BaseWindow::Allocate(&_patches_selection_desc);
 }
 /**
 * Draw [<][>] boxes.
 		GfxFillRect(x + 11, y + 1, x + 11 + 8, y + 8, color);
 }
 static char _str_separator[2];
-static void CustCurrencyWndProc(Window *w, WindowEvent *e)
+static void CustCurrencyWndProc(BaseWindow *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_PAINT: {
 			int x;
 			int y = 20;
 			MarkWholeScreenDirty();
 			break;
 	}
 }
-static const Widget _cust_currency_widgets[] = {
+static const OldWidget _cust_currency_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,            STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   229,     0,    13, STR_CURRENCY_WINDOW, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   229,    14,   119, 0x0,                 STR_NULL},
 {   WIDGETS_END},
 };
 {
 	_str_separator[0] = _custom_currency.separator;
 	_str_separator[1] = '\0';
 	DeleteWindowById(WC_CUSTOM_CURRENCY, 0);
-	AllocateWindowDesc(&_cust_currency_desc);
+	BaseWindow::Allocate(&_cust_currency_desc);
 }

branch	cpp_gui
changeset 6258	a2f86b8fd99b
parent 6254	abc6ad7c035c
child 6298	c30fe89622df