diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-02-03 13:07:57 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-02-03 13:07:57 +0300 |
commit | ca4582756ce9ad0c4f4222da0760bd6ccffc829a (patch) | |
tree | 3d65b06b31aadf18f59bce4e0802945158a52950 /src/playerrelations.cpp | |
parent | ab4a00c231e84267c7d06b2b1bb167593f22d91f (diff) | |
download | mv-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.gz mv-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.bz2 mv-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.tar.xz mv-ca4582756ce9ad0c4f4222da0760bd6ccffc829a.zip |
Fix inventory sorting.
Was broken because conflict with buy dialog sorting.
Diffstat (limited to 'src/playerrelations.cpp')
-rw-r--r-- | src/playerrelations.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp index 0b5507876..cfba142ed 100644 --- a/src/playerrelations.cpp +++ b/src/playerrelations.cpp @@ -49,7 +49,7 @@ typedef PlayerRelations::const_iterator PlayerRelationsCIter; typedef std::list<PlayerRelationsListener *> PlayerRelationListeners; typedef PlayerRelationListeners::const_iterator PlayerRelationListenersCIter; -static class SortPlayersFunctor final +class SortPlayersFunctor final { public: bool operator() (const std::string &str1, @@ -63,7 +63,7 @@ static class SortPlayersFunctor final return str1 < str2; return s1 < s2; } -} playersSorter; +} playersRelSorter; // (De)serialisation class class PlayerConfSerialiser final : @@ -352,7 +352,7 @@ StringVect * PlayerRelationsManager::getPlayers() retval->push_back(it->first); } - std::sort(retval->begin(), retval->end(), playersSorter); + std::sort(retval->begin(), retval->end(), playersRelSorter); return retval; } @@ -368,7 +368,7 @@ StringVect *PlayerRelationsManager::getPlayersByRelation( retval->push_back(it->first); } - std::sort(retval->begin(), retval->end(), playersSorter); + std::sort(retval->begin(), retval->end(), playersRelSorter); return retval; } |