1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00

Fixed RETURN_IF_BATTLE(). Undid disabled warnings. Fixed indentation.

This commit is contained in:
John Bolton
2020-10-05 16:27:04 -07:00
parent aee51ecc27
commit c61bae4060
24 changed files with 99 additions and 102 deletions

View File

@@ -101,7 +101,7 @@ bool mapSorter::operator()(const std::shared_ptr<CMapInfo> aaa, const std::share
{
case _numOfMaps: //by number of maps in campaign
return CGI->generaltexth->campaignRegionNames[aaa->campaignHeader->mapVersion].size() <
CGI->generaltexth->campaignRegionNames[bbb->campaignHeader->mapVersion].size();
CGI->generaltexth->campaignRegionNames[bbb->campaignHeader->mapVersion].size();
break;
case _name: //by name
return boost::ilexicographical_compare(aaa->campaignHeader->name, bbb->campaignHeader->name);