games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +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
lib/spells/CSpellHandler.cpp
View File

@@ -349,7 +349,7 @@ si32 CSpell::getProbability(const FactionID & factionId) const
return probabilities.at(factionId);
}
void CSpell::getEffects(std::vector<Bonus> & lst, const int level, const bool cumulative, const si32 duration, boost::optional<si32 *> maxDuration) const
void CSpell::getEffects(std::vector<Bonus> & lst, const int level, const bool cumulative, const si32 duration, std::optional<si32 *> maxDuration) const
{
if(level < 0 || level >= GameConstants::SPELL_SCHOOL_LEVELS)
{
@@ -377,7 +377,7 @@ void CSpell::getEffects(std::vector<Bonus> & lst, const int level, const bool cu
if(nb.turnsRemain == 0)
nb.turnsRemain = duration;
if(maxDuration)
vstd::amax(*(maxDuration.get()), nb.turnsRemain);
vstd::amax(*(maxDuration.value()), nb.turnsRemain);
lst.push_back(nb);
}