MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manipulator: Sort custom professions 

Also use == instead of string::compare()
develop
lethosor 2016-12-15 19:18:07 -05:00
parent 7b2e6f299f
commit a5eb5d2502
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/manipulator.cpp
Unescape Escape View File

@ -647,7 +647,7 @@ struct ProfessionTemplate
name = line.substr(nextInd + 1); name = line.substr(nextInd + 1);
continue; continue;
} }
if (line.compare("MASK")==0) if (line == "MASK")
{ {
mask = true; mask = true;
continue; continue;
@ -655,7 +655,7 @@ struct ProfessionTemplate
for (int i = 0; i < NUM_COLUMNS; i++) for (int i = 0; i < NUM_COLUMNS; i++)
{ {
if (line.compare(ENUM_KEY_STR(unit_labor, columns[i].labor)) == 0) if (line == ENUM_KEY_STR(unit_labor, columns[i].labor))
{ {
labors.push_back(columns[i].labor); labors.push_back(columns[i].labor);
} }
@ -743,9 +743,10 @@ public:
return; return;
} }
Filesystem::listdir(professions_folder, files); Filesystem::listdir(professions_folder, files);
std::sort(files.begin(), files.end());
for(size_t i = 0; i < files.size(); i++) for(size_t i = 0; i < files.size(); i++)
{ {
if (files[i].compare(".") == 0 || files[i].compare("..") == 0) if (files[i] == "." || files[i] == "..")
continue; continue;
ProfessionTemplate t; ProfessionTemplate t;