From ca4582756ce9ad0c4f4222da0760bd6ccffc829a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 3 Feb 2013 13:07:57 +0300 Subject: Fix inventory sorting. Was broken because conflict with buy dialog sorting. --- src/playerrelations.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/playerrelations.cpp') 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 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; } -- cgit v1.2.3-70-g09d2