games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-10-10 22:51:25 +02:00
parent eb94c9f0be 51838f020b
commit 856e1f0ef8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/lobby/SelectionTab.cpp
View File

@@ -829,6 +829,7 @@ void SelectionTab::parseSaves(const std::unordered_set<ResourcePath> & files)
{ {
auto mapInfo = std::make_shared<ElementInfo>(); auto mapInfo = std::make_shared<ElementInfo>();
mapInfo->saveInit(file); mapInfo->saveInit(file);
mapInfo->name = mapInfo->getNameForList();
// Filter out other game modes // Filter out other game modes
bool isCampaign = mapInfo->scenarioOptionsOfSave->mode == EStartMode::CAMPAIGN; bool isCampaign = mapInfo->scenarioOptionsOfSave->mode == EStartMode::CAMPAIGN;
@@ -875,6 +876,7 @@ void SelectionTab::parseCampaigns(const std::unordered_set<ResourcePath> & files
auto info = std::make_shared<ElementInfo>(); auto info = std::make_shared<ElementInfo>();
//allItems[i].date = std::asctime(std::localtime(&files[i].date)); //allItems[i].date = std::asctime(std::localtime(&files[i].date));
info->fileURI = file.getOriginalName(); info->fileURI = file.getOriginalName();
info->name = info->getNameForList();
info->campaignInit(); info->campaignInit();
if(info->campaign) if(info->campaign)
allItems.push_back(info); allItems.push_back(info);