dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r21344) -Feature [FS#4214]: Natural sorting of strings using ICU.

Browse Source
This commit is contained in:
terkhen
2010-11-27 22:52:12 +00:00
parent 4b944cb13e
commit 75f86a7a21
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_gui.cpp
View File

@@ -120,7 +120,7 @@ static int CDECL IndustryTypeNameSorter(const IndustryType *a, const IndustryTyp
SetDParam(0, indsp2->name);
GetString(industry_name[1], STR_JUST_STRING, lastof(industry_name[1]));
int r = strcmp(industry_name[0], industry_name[1]);
int r = strnatcmp(industry_name[0], industry_name[1]); // Sort by name (natural sorting).
/* If the names are equal, sort by industry type. */
return (r != 0) ? r : (*a - *b);
@@ -1137,7 +1137,7 @@ protected:
GetString(buf_cache, STR_INDUSTRY_NAME, lastof(buf_cache));
}
return strcmp(buf, buf_cache);
return strnatcmp(buf, buf_cache); // Sort by name (natural sorting).
}
/** Sort industries by type and name */