diff options
| author | tron <tron@openttd.org> | 2005-10-17 19:57:00 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-10-17 19:57:00 +0000 |
| commit | 23ecc82ad31b29dbf2adc3dd0f6f7550b3ac3e69 (patch) | |
| tree | 55174ff380184f8b141b398364301899461e7fb6 /misc_gui.c | |
| parent | b85da4fef2897039e198da97f524f1ca9c6bf913 (diff) | |
| download | openttd-23ecc82ad31b29dbf2adc3dd0f6f7550b3ac3e69.tar.xz | |
(svn r3055) Give the savegame/scenarion sort order flags symbolic names
Diffstat (limited to 'misc_gui.c')
| -rw-r--r-- | misc_gui.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/misc_gui.c b/misc_gui.c index 2701ec4e9..e040c96ea 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -1246,7 +1246,11 @@ static void SaveLoadDlgWndProc(Window *w, WindowEvent *e) } GfxFillRect(w->widget[6].left + 1, w->widget[6].top + 1, w->widget[6].right, w->widget[6].bottom, 0xD7); - DoDrawString(_savegame_sort_order & 1 ? DOWNARROW : UPARROW, _savegame_sort_order <= 1 ? w->widget[3].right - 9 : w->widget[2].right - 9, 15, 0x10); + DoDrawString( + _savegame_sort_order & SORT_DESCENDING ? DOWNARROW : UPARROW, + _savegame_sort_order & SORT_BY_NAME ? w->widget[2].right - 9 : w->widget[3].right - 9, + 15, 16 + ); y = w->widget[6].top + 1; pos = w->vscroll.pos; @@ -1267,13 +1271,15 @@ static void SaveLoadDlgWndProc(Window *w, WindowEvent *e) case WE_CLICK: switch(e->click.widget) { case 2: /* Sort save names by name */ - _savegame_sort_order = (_savegame_sort_order == 2) ? 3 : 2; + _savegame_sort_order = (_savegame_sort_order == SORT_BY_NAME) ? + SORT_BY_NAME | SORT_DESCENDING : SORT_BY_NAME; _savegame_sort_dirty = true; SetWindowDirty(w); break; case 3: /* Sort save names by date */ - _savegame_sort_order = (_savegame_sort_order == 0) ? 1 : 0; + _savegame_sort_order = (_savegame_sort_order == SORT_BY_DATE) ? + SORT_BY_DATE | SORT_DESCENDING : SORT_BY_DATE; _savegame_sort_dirty = true; SetWindowDirty(w); break; @@ -1489,7 +1495,11 @@ static void SelectScenarioWndProc(Window *w, WindowEvent *e) { SetVScrollCount(w, _fios_num); DrawWindowWidgets(w); - DoDrawString(_savegame_sort_order & 1 ? DOWNARROW : UPARROW, _savegame_sort_order <= 1 ? w->widget[4].right - 9 : w->widget[3].right - 9, 15, 0x10); + DoDrawString( + _savegame_sort_order & SORT_DESCENDING ? DOWNARROW : UPARROW, + _savegame_sort_order & SORT_BY_NAME ? w->widget[3].right - 9 : w->widget[4].right - 9, + 15, 16 + ); DrawString(4, 32, STR_4010_GENERATE_RANDOM_NEW_GAME, 9); y = list_start; @@ -1508,13 +1518,15 @@ static void SelectScenarioWndProc(Window *w, WindowEvent *e) { case WE_CLICK: switch(e->click.widget) { case 3: /* Sort scenario names by name */ - _savegame_sort_order = (_savegame_sort_order == 2) ? 3 : 2; + _savegame_sort_order = (_savegame_sort_order == SORT_BY_NAME) ? + SORT_BY_NAME | SORT_DESCENDING : SORT_BY_NAME; _savegame_sort_dirty = true; SetWindowDirty(w); break; case 4: /* Sort scenario names by date */ - _savegame_sort_order = (_savegame_sort_order == 0) ? 1 : 0; + _savegame_sort_order = (_savegame_sort_order == SORT_BY_DATE) ? + SORT_BY_DATE | SORT_DESCENDING : SORT_BY_DATE; _savegame_sort_dirty = true; SetWindowDirty(w); break; |