games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge branch 'develop' into fix_map_sorting

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-16 19:19:27 +02:00
committed by GitHub
parent 749149a679 134535ee15
commit 860f65ea62
92 changed files with 10711 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/lobby/SelectionTab.cpp
View File

@@ -48,6 +48,7 @@
#include "../../lib/TerrainHandler.h"
#include "../../lib/UnlockGuard.h"
#include "../../lib/GameLibrary.h"
#include "../../lib/json/JsonUtils.h"
bool mapSorter::operator()(const std::shared_ptr<ElementInfo> aaa, const std::shared_ptr<ElementInfo> bbb)
{
@@ -618,7 +619,13 @@ void SelectionTab::sort()
if(!sortModeAscending)
{
if(firstMapIndex)
std::reverse(std::next(curItems.begin(), boost::starts_with(curItems[0]->folderName, "..") ? 1 : 0), std::next(curItems.begin(), firstMapIndex - 1));
{
auto startIt = std::next(curItems.begin(), boost::starts_with(curItems[0]->folderName, "..") ? 1 : 0);
auto endIt = std::next(curItems.begin(), firstMapIndex - 1);
if(startIt > endIt)
std::swap(startIt, endIt);
std::reverse(startIt, endIt);
}
std::reverse(std::next(curItems.begin(), firstMapIndex), curItems.end());
}
@@ -956,7 +963,7 @@ void SelectionTab::handleUnsupportedSavegames(const std::vector<ResourcePath> &
void SelectionTab::parseCampaigns(const std::unordered_set<ResourcePath> & files)
{
auto campaignSets = JsonNode(JsonPath::builtin("config/campaignSets.json"));
auto campaignSets = JsonUtils::assembleFromFiles("config/campaignSets.json");
auto mainmenu = JsonNode(JsonPath::builtin("config/mainmenu.json"));
allItems.reserve(files.size());