mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Resolved warnings, and removed duplicated function.

This commit is contained in:
Hielke Morsink 2015-12-01 12:03:34 +01:00
parent 666da74beb
commit 90e67772e0
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game.c
View File

@ -1050,7 +1050,7 @@ void save_game()
}
void save_game_as()
{
window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, path_get_filename(gScenarioSavePath));
window_loadsave_open(LOADSAVETYPE_SAVE | LOADSAVETYPE_GAME, (char*)path_get_filename(gScenarioSavePath));
}

2
src/util/util.c
View File

@ -75,7 +75,7 @@ const char *path_get_filename(const utf8 *path)
const char *path_get_extension(const utf8 *path)
{
// Get the filename from the path
char *filename = path_get_filename(path);
const char *filename = path_get_filename(path);
// Try to find the most-right dot in the filename
char *extension = strrchr(filename, '.');

15
src/windows/loadsave.c
View File

@ -573,15 +573,6 @@ static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i
}
}
static int compare_string_case_insensitive(char const *a, char const *b)
{
for (;; a++, b++) {
int d = tolower(*a) - tolower(*b);
if (d != 0 || !*a)
return d;
}
}
static int list_item_sort(const void *a, const void *b)
{
const loadsave_list_item *itemA = (loadsave_list_item*)a;
@ -592,15 +583,15 @@ static int list_item_sort(const void *a, const void *b)
switch (gConfigGeneral.load_save_sort){
case SORT_NAME_ASCENDING:
return compare_string_case_insensitive(itemA->name, itemB->name);
return strcicmp(itemA->name, itemB->name);
case SORT_NAME_DESCENDING:
return -compare_string_case_insensitive(itemA->name, itemB->name);
return -strcicmp(itemA->name, itemB->name);
case SORT_DATE_DESCENDING:
return (int) -difftime(itemA->date_modified, itemB->date_modified);
case SORT_DATE_ASCENDING:
return (int) difftime(itemA->date_modified, itemB->date_modified);
default:
return compare_string_case_insensitive(itemA->name, itemB->name);
return strcicmp(itemA->name, itemB->name);
}
}