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

suggested changes

Browse Source
This commit is contained in:
SoundSSGood
2025-05-17 19:01:04 +02:00
parent 051381d4db
commit e85b1d4c1c
10 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/entities/artifact/CArtifact.cpp
View File

@@ -247,14 +247,15 @@ bool CArtifact::canBePutAt(const CArtifactSet * artSet, ArtifactPosition slot, b
}
CChargedArtifact::CChargedArtifact()
: removeOnDepletion(false)
: condition(DischargeArtifactCondition::NONE)
, removeOnDepletion(false)
, defaultStartCharges(0)
{
}
bool CChargedArtifact::isCharged() const
{
return condition.has_value();
return condition != DischargeArtifactCondition::NONE;
}
void CChargedArtifact::setCondition(const DischargeArtifactCondition & dischargeCondition)
@@ -277,7 +278,7 @@ uint16_t CChargedArtifact::getDefaultStartCharges() const
return defaultStartCharges;
}
std::optional<DischargeArtifactCondition> CChargedArtifact::getDischargeCondition() const
DischargeArtifactCondition CChargedArtifact::getDischargeCondition() const
{
return condition;
}