mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17528) -Codechange: use QSortT instead of qsort for sorting FiosItems

release/1.0
rubidium 2009-09-13 17:39:33 +00:00
parent 67448246d3
commit ca7f6f5d7a
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/fios.cpp
View File

@ -13,6 +13,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "openttd.h" #include "openttd.h"
#include "core/sort_func.hpp"
#include "fios.h" #include "fios.h"
#include "fileio_func.h" #include "fileio_func.h"
#include "tar_type.h" #include "tar_type.h"
@ -43,15 +44,13 @@ extern bool FiosGetDiskFreeSpace(const char *path, uint64 *tot);
extern void GetOldSaveGameName(const char *file, char *title, const char *last); extern void GetOldSaveGameName(const char *file, char *title, const char *last);
/** /**
* Compare two FiosItem's. Used with qsort when sorting the file list. * Compare two FiosItem's. Used with sort when sorting the file list.
* @param a A pointer to the first FiosItem to compare. * @param da A pointer to the first FiosItem to compare.
* @param b A pointer to the second FiosItem to compare. * @param db A pointer to the second FiosItem to compare.
* @return -1, 0 or 1, depending on how the two items should be sorted. * @return -1, 0 or 1, depending on how the two items should be sorted.
*/ */
int CDECL compare_FiosItems(const void *a, const void *b) int CDECL CompareFiosItems(const FiosItem *da, const FiosItem *db)
{ {
const FiosItem *da = (const FiosItem *)a;
const FiosItem *db = (const FiosItem *)b;
int r = 0; int r = 0;
if ((_savegame_sort_order & SORT_BY_NAME) == 0 && da->mtime != db->mtime) { if ((_savegame_sort_order & SORT_BY_NAME) == 0 && da->mtime != db->mtime) {
@ -309,7 +308,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
{ {
byte order = _savegame_sort_order; byte order = _savegame_sort_order;
_savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING; _savegame_sort_order = SORT_BY_NAME | SORT_ASCENDING;
qsort(_fios_items.Begin(), _fios_items.Length(), sizeof(FiosItem), compare_FiosItems); QSortT(_fios_items.Begin(), _fios_items.Length(), CompareFiosItems);
_savegame_sort_order = order; _savegame_sort_order = order;
} }
@ -324,7 +323,7 @@ static void FiosGetFileList(SaveLoadDialogMode mode, fios_getlist_callback_proc
scanner.Scan(NULL, subdir, true, true); scanner.Scan(NULL, subdir, true, true);
} }
qsort(_fios_items.Get(sort_start), _fios_items.Length() - sort_start, sizeof(FiosItem), compare_FiosItems); QSortT(_fios_items.Get(sort_start), _fios_items.Length() - sort_start, CompareFiosItems);
/* Show drives */ /* Show drives */
if (mode != SLD_NEW_GAME) FiosGetDrives(); if (mode != SLD_NEW_GAME) FiosGetDrives();

2
src/fios.h
View File

@ -115,6 +115,6 @@ void FiosMakeSavegameName(char *buf, const char *name, size_t size);
/* Determines type of savegame (or tells it is not a savegame) */ /* Determines type of savegame (or tells it is not a savegame) */
FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last); FiosType FiosGetSavegameListCallback(SaveLoadDialogMode mode, const char *file, const char *ext, char *title, const char *last);
int CDECL compare_FiosItems(const void *a, const void *b); int CDECL CompareFiosItems(const FiosItem *a, const FiosItem *b);
#endif /* FIOS_H */ #endif /* FIOS_H */

5
src/misc_gui.cpp
View File

@ -40,6 +40,7 @@
#include "newgrf_cargo.h" #include "newgrf_cargo.h"
#include "tilehighlight_func.h" #include "tilehighlight_func.h"
#include "querystring_gui.h" #include "querystring_gui.h"
#include "core/sort_func.hpp"
#include "table/strings.h" #include "table/strings.h"
@ -1746,9 +1747,7 @@ static void MakeSortedSaveGameList()
} }
uint s_amount = _fios_items.Length() - sort_start - sort_end; uint s_amount = _fios_items.Length() - sort_start - sort_end;
if (s_amount > 0) { QSortT(_fios_items.Get(sort_start), s_amount, CompareFiosItems);
qsort(_fios_items.Get(sort_start), s_amount, sizeof(FiosItem), compare_FiosItems);
}
} }
extern void StartupEngines(); extern void StartupEngines();