Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r3055) Give the savegame/scenarion sort order flags symbolic names

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
tron 19 years ago
parent b85da4fef2
commit 23ecc82ad3
6 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File

24
misc_gui.c
Unescape Escape View File

@ -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); 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; y = w->widget[6].top + 1;
pos = w->vscroll.pos; pos = w->vscroll.pos;
@ -1267,13 +1271,15 @@ static void SaveLoadDlgWndProc(Window *w, WindowEvent *e)
case WE_CLICK: case WE_CLICK:
switch(e->click.widget) { switch(e->click.widget) {
case 2: /* Sort save names by name */ 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; _savegame_sort_dirty = true;
SetWindowDirty(w); SetWindowDirty(w);
break; break;
case 3: /* Sort save names by date */ 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; _savegame_sort_dirty = true;
SetWindowDirty(w); SetWindowDirty(w);
break; break;
@ -1489,7 +1495,11 @@ static void SelectScenarioWndProc(Window *w, WindowEvent *e) {
SetVScrollCount(w, _fios_num); SetVScrollCount(w, _fios_num);
DrawWindowWidgets(w); 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); DrawString(4, 32, STR_4010_GENERATE_RANDOM_NEW_GAME, 9);
y = list_start; y = list_start;
@ -1508,13 +1518,15 @@ static void SelectScenarioWndProc(Window *w, WindowEvent *e) {
case WE_CLICK: case WE_CLICK:
switch(e->click.widget) { switch(e->click.widget) {
case 3: /* Sort scenario names by name */ 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; _savegame_sort_dirty = true;
SetWindowDirty(w); SetWindowDirty(w);
break; break;
case 4: /* Sort scenario names by date */ 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; _savegame_sort_dirty = true;
SetWindowDirty(w); SetWindowDirty(w);
break; break;

2
openttd.c
Unescape Escape View File

@ -470,7 +470,7 @@ int ttd_main(int argc, char* argv[])
LoadDriver(SOUND_DRIVER, _ini_sounddriver); LoadDriver(SOUND_DRIVER, _ini_sounddriver);
LoadDriver(MUSIC_DRIVER, _ini_musicdriver); LoadDriver(MUSIC_DRIVER, _ini_musicdriver);
LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads LoadDriver(VIDEO_DRIVER, _ini_videodriver); // load video last, to prevent an empty window while sound and music loads
_savegame_sort_order = 1; // default sorting of savegames is by date, newest first _savegame_sort_order = SORT_BY_DATE | SORT_DESCENDING;
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
// initialize network-core // initialize network-core

7
openttd.h
Unescape Escape View File

@ -523,6 +523,13 @@ enum SpecialStrings {
typedef void PlaceProc(TileIndex tile); typedef void PlaceProc(TileIndex tile);
enum {
SORT_ASCENDING = 0,
SORT_DESCENDING = 1,
SORT_BY_DATE = 0,
SORT_BY_NAME = 2
};
VARDEF byte _savegame_sort_order; VARDEF byte _savegame_sort_order;
#define INVALID_UINT_TILE (uint)0xFFFFFFFF #define INVALID_UINT_TILE (uint)0xFFFFFFFF

13
os2.c
Unescape Escape View File

@ -51,12 +51,13 @@ int compare_FiosItems(const void *a, const void *b)
const FiosItem *db = (const FiosItem *)b; const FiosItem *db = (const FiosItem *)b;
int r; int r;
if (_savegame_sort_order < 2) // sort by date if (_savegame_sort_order & SORT_BY_NAME) {
r = da->mtime < db->mtime ? -1 : 1;
else
r = strcasecmp(da->title, db->title); r = strcasecmp(da->title, db->title);
} else {
r = da->mtime < db->mtime ? -1 : 1;
}
if (_savegame_sort_order & 1) r = -r; if (_savegame_sort_order & SORT_DESCENDING) r = -r;
return r; return r;
} }
@ -116,7 +117,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }
@ -243,7 +244,7 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }

13
unix.c
Unescape Escape View File

@ -70,12 +70,13 @@ int compare_FiosItems(const void *a, const void *b)
const FiosItem *db = (const FiosItem *)b; const FiosItem *db = (const FiosItem *)b;
int r; int r;
if (_savegame_sort_order < 2) // sort by date if (_savegame_sort_order & SORT_BY_NAME) {
r = da->mtime < db->mtime ? -1 : 1;
else
r = strcasecmp(da->title, db->title); r = strcasecmp(da->title, db->title);
} else {
r = da->mtime < db->mtime ? -1 : 1;
}
if (_savegame_sort_order & 1) r = -r; if (_savegame_sort_order & SORT_DESCENDING) r = -r;
return r; return r;
} }
@ -128,7 +129,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }
@ -229,7 +230,7 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }

13
win32.c
Unescape Escape View File

@ -644,12 +644,13 @@ int CDECL compare_FiosItems(const void *a, const void *b)
const FiosItem *db = (const FiosItem *)b; const FiosItem *db = (const FiosItem *)b;
int r; int r;
if (_savegame_sort_order < 2) // sort by date if (_savegame_sort_order & SORT_BY_NAME) {
r = da->mtime < db->mtime ? -1 : 1;
else
r = strcasecmp(da->title, db->title); r = strcasecmp(da->title, db->title);
} else {
r = da->mtime < db->mtime ? -1 : 1;
}
if (_savegame_sort_order & 1) r = -r; if (_savegame_sort_order & SORT_DESCENDING) r = -r;
return r; return r;
} }
@ -698,7 +699,7 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }
@ -812,7 +813,7 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
{ {
/* XXX ugly global variables ... */ /* XXX ugly global variables ... */
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems); qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }

Write Preview
Loading…
Cancel
Save