petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2860) Fix some issues in the savegame/scenario list code:

Browse Source 
-Fix: Sort the directories when making a scenario list
-Fix: Sort the directories when making a savegame list on Windows
-Fix: On OS/2 show the trailing \ if the current directory is a root directory
-Regression: On OS/2 the savegame list showed the scenario directory or crashed (probably introduced in r2609)
The rest is diff reduction between the 3 variants
This commit is contained in:
tron
2005-08-12 06:37:48 +00:00
parent 7e702e2d50
commit bdff0fa2d2
3 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
win32.c
View File

@@ -647,6 +647,14 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
FindClose(h);
}
{
/* XXX ugly global variables ... */
byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order;
}
// this is where to start sorting
sort_start = _fios_count;
@@ -672,7 +680,6 @@ FiosItem *FiosGetSavegameList(int *num, int mode)
*t = '\0'; // strip extension
ttd_strlcpy(fios->title, fd.cFileName, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO) {
if (t != NULL && (
strcasecmp(t, ".ss1") == 0 ||
@@ -754,6 +761,14 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
FindClose(h);
}
{
/* XXX ugly global variables ... */
byte order = _savegame_sort_order;
_savegame_sort_order = 2; // sort ascending by name
qsort(_fios_items, _fios_count, sizeof(FiosItem), compare_FiosItems);
_savegame_sort_order = order;
}
// this is where to start sorting
sort_start = _fios_count;
@@ -776,9 +791,8 @@ FiosItem *FiosGetScenarioList(int *num, int mode)
fios->mtime = *(uint64*)&fd.ftLastWriteTime;
ttd_strlcpy(fios->name, fd.cFileName, lengthof(fios->name));
*t = '\0'; // strip extension
*t = '\0'; // strip extension
ttd_strlcpy(fios->title, fd.cFileName, lengthof(fios->title));
} else if (mode == SLD_LOAD_GAME || mode == SLD_LOAD_SCENARIO ||
mode == SLD_NEW_GAME) {
if (t != NULL && (
@@ -842,14 +856,14 @@ char *FiosBrowseTo(const FiosItem *item)
case FIOS_TYPE_PARENT:
s = strrchr(path, '\\');
if (s != NULL) *s = '\0';
if (path[2] == '\0' ) strcat(path, "\\");
if (s != path + 2)
s[0] = '\0';
else
s[1] = '\0';
break;
case FIOS_TYPE_DIR:
s = strchr(item->name, '\\');
if (s != NULL) *s = '\0';
if (path[3] != '\0' ) strcat(path, "\\");
if (path[3] != '\0') strcat(path, "\\");
strcat(path, item->name);
break;