diff options
| -rw-r--r-- | lang/english.txt | 2 | ||||
| -rw-r--r-- | main_gui.c | 31 | ||||
| -rw-r--r-- | settings_gui.c | 6 |
3 files changed, 18 insertions, 21 deletions
diff --git a/lang/english.txt b/lang/english.txt index e547df307..2799e1990 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -741,8 +741,6 @@ STR_NEWGRF_SETTINGS :Newgrf settings STR_NEWGRF_SETTINGS2 :Newgrf settings STR_GAMEOPTMENU_0A : STR_GAMEOPTMENU_0B : -STR_CLOSE_ALL_WINDOWS :Close ALL windows -STR_CLOSE_ALL_WINDOWS2 :Close ALL windows STR_02C9_TOWN_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Town names displayed STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Town names displayed STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Station names displayed diff --git a/main_gui.c b/main_gui.c index 4098e2f1f..df77dddfc 100644 --- a/main_gui.c +++ b/main_gui.c @@ -167,14 +167,13 @@ static void MenuClickSettings(int index) case 2: ShowPatchesSelection(); return; case 3: ShowNewgrf(); return; - case 5: DeleteAllNonVitalWindows(); return; - case 6: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return; - case 7: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return; - case 8: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return; - case 9: _display_opt ^= DO_WAYPOINTS; MarkWholeScreenDirty(); return; - case 10: _display_opt ^= DO_FULL_ANIMATION; MarkWholeScreenDirty(); return; - case 11: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return; - case 12: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return; + case 5: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return; + case 6: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return; + case 7: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return; + case 8: _display_opt ^= DO_WAYPOINTS; MarkWholeScreenDirty(); return; + case 9: _display_opt ^= DO_FULL_ANIMATION; MarkWholeScreenDirty(); return; + case 10: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return; + case 11: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return; } } @@ -975,16 +974,16 @@ static void ToolbarOptionsClick(Window *w) { uint16 x; - w = PopupMainToolbMenu(w, 43, 2, STR_02C3_GAME_OPTIONS, 13); + w = PopupMainToolbMenu(w, 43, 2, STR_02C3_GAME_OPTIONS, 12); x = (uint16)-1; - if (_display_opt & DO_SHOW_TOWN_NAMES) x &= ~(1<<6); - if (_display_opt & DO_SHOW_STATION_NAMES) x &= ~(1<<7); - if (_display_opt & DO_SHOW_SIGNS) x &= ~(1<<8); - if (_display_opt & DO_WAYPOINTS) x &= ~(1<<9); - if (_display_opt & DO_FULL_ANIMATION) x &= ~(1<<10); - if (_display_opt & DO_FULL_DETAIL) x &= ~(1<<11); - if (_display_opt & DO_TRANS_BUILDINGS) x &= ~(1<<12); + if (_display_opt & DO_SHOW_TOWN_NAMES) x &= ~(1<<5); + if (_display_opt & DO_SHOW_STATION_NAMES) x &= ~(1<<6); + if (_display_opt & DO_SHOW_SIGNS) x &= ~(1<<7); + if (_display_opt & DO_WAYPOINTS) x &= ~(1<<8); + if (_display_opt & DO_FULL_ANIMATION) x &= ~(1<<9); + if (_display_opt & DO_FULL_DETAIL) x &= ~(1<<10); + if (_display_opt & DO_TRANS_BUILDINGS) x &= ~(1<<11); WP(w,menu_d).checked_items = x; } diff --git a/settings_gui.c b/settings_gui.c index 42e1ef2e2..9b19a7119 100644 --- a/settings_gui.c +++ b/settings_gui.c @@ -1256,15 +1256,15 @@ static const Widget _newgrf_widgets[] = { { WWT_CLOSEBOX, RESIZE_NONE, 14, 159, 170, 244, 255, STR_0189, STR_NULL}, { WWT_CLOSEBOX, RESIZE_NONE, 14, 175, 274, 244, 255, STR_NEWGRF_SET_PARAMETERS, STR_NULL}, -{ WWT_CLOSEBOX, RESIZE_NONE, 3, 5, 138, 261, 272, STR_NEWGRF_APPLY_CHANGES, STR_NULL}, -{ WWT_CLOSEBOX, RESIZE_NONE, 3, 142, 274, 261, 272, STR_012E_CANCEL, STR_NULL}, +{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 5, 138, 261, 272, STR_NEWGRF_APPLY_CHANGES, STR_NULL}, +{ WWT_PUSHTXTBTN, RESIZE_NONE, 3, 142, 274, 261, 272, STR_012E_CANCEL, STR_NULL}, { WIDGETS_END}, }; static const WindowDesc _newgrf_desc = { WDP_CENTER, WDP_CENTER, 280, 277, WC_GAME_OPTIONS,0, - WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, + WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS, _newgrf_widgets, NewgrfWndProc, }; |