Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from AttorneyOnline/fix/area-sort

Browse Source 
Fix areas being sorted lexicographically by storing a numerical position in the area name and sorting numerically
This commit is contained in:
scatterflower 2021-03-11 13:42:58 -06:00 committed by GitHub
commit eba21d9108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/config_sample/areas.ini
View File

@ -1,10 +1,10 @@
[Basement] [0:Basement]
background=gs4 background=gs4
protected_area=true protected_area=true
iniswap_allowed=false iniswap_allowed=false
evidence_mod=cm evidence_mod=cm
[Courtroom 1] [1:Courtroom 1]
background=gs4 background=gs4
protected_area=false protected_area=false
iniswap_allowed=true iniswap_allowed=true

11
src/server.cpp
View File

@ -79,7 +79,16 @@ void Server::start()
bg_file.close(); bg_file.close();
QSettings areas_ini("config/areas.ini", QSettings::IniFormat); QSettings areas_ini("config/areas.ini", QSettings::IniFormat);
area_names = areas_ini.childGroups(); area_names = areas_ini.childGroups(); // invisibly does a lexicographical sort, because Qt is great like that
std::sort(area_names.begin(), area_names.end(), [] (const QString &a, const QString &b) {return a.split(":")[0].toInt() < b.split(":")[0].toInt();});
QStringList sanitized_area_names;
for (QString area_name : area_names) {
QStringList name_split = area_name.split(":");
name_split.removeFirst();
QString area_name_sanitized = name_split.join(":");
sanitized_area_names.append(area_name_sanitized);
}
area_names = sanitized_area_names;
for (int i = 0; i < area_names.length(); i++) { for (int i = 0; i < area_names.length(); i++) {
QString area_name = area_names[i]; QString area_name = area_names[i];
areas.insert(i, new AreaData(characters, area_name, i)); areas.insert(i, new AreaData(characters, area_name, i));