From a5eb5d25028eaea2e2ad4454e0961676597d99d4 Mon Sep 17 00:00:00 2001 From: lethosor Date: Thu, 15 Dec 2016 19:18:07 -0500 Subject: [PATCH] manipulator: Sort custom professions Also use == instead of string::compare() --- plugins/manipulator.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp index 2bbb9d8c3..76b8251b5 100644 --- a/plugins/manipulator.cpp +++ b/plugins/manipulator.cpp @@ -647,7 +647,7 @@ struct ProfessionTemplate name = line.substr(nextInd + 1); continue; } - if (line.compare("MASK")==0) + if (line == "MASK") { mask = true; continue; @@ -655,7 +655,7 @@ struct ProfessionTemplate 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); } @@ -743,9 +743,10 @@ public: return; } Filesystem::listdir(professions_folder, files); + std::sort(files.begin(), files.end()); for(size_t i = 0; i < files.size(); i++) { - if (files[i].compare(".") == 0 || files[i].compare("..") == 0) + if (files[i] == "." || files[i] == "..") continue; ProfessionTemplate t;