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

vcmi: use std::optional

Browse Source
This commit is contained in:
Konstantin
2023-04-16 20:42:56 +03:00
parent 0d35606a44
commit 7a5775a9f9
135 changed files with 552 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/CVCMIServer.cpp
View File

@@ -296,7 +296,7 @@ bool CVCMIServer::prepareToStartGame()
{
case StartInfo::CAMPAIGN:
logNetwork->info("Preparing to start new campaign");
si->campState->currentMap = boost::make_optional(campaignMap);
si->campState->currentMap = std::make_optional(campaignMap);
si->campState->chosenCampaignBonuses[campaignMap] = campaignBonus;
gh->init(si.get());
break;
@@ -665,7 +665,7 @@ void CVCMIServer::updateStartInfoOnMapChange(std::shared_ptr<CMapInfo> mapInfo,
si = CMemorySerializer::deepCopy(*mi->scenarioOptionsOfSave);
si->mode = StartInfo::LOAD_GAME;
if(si->campState)
campaignMap = si->campState->currentMap.get();
campaignMap = si->campState->currentMap.value();
for(auto & ps : si->playerInfos)
{