Skip to content

Commit

Permalink
EffectCondition: rename Description to FailReason
Browse files Browse the repository at this point in the history
  • Loading branch information
Regynate committed Jan 31, 2025
1 parent ae9096d commit b10ed6d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions ChaosMod/Effects/Condition/EffectCondition.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ enum class EffectConditionType
ProportionalVotingEnabled
};

#define REGISTER_EFFECT_CONDITION(conditionType, condition, description) \
namespace \
{ \
EffectCondition CONCAT(_effectCondition, __LINE__)(conditionType, condition, description); \
#define REGISTER_EFFECT_CONDITION(conditionType, condition, failReason) \
namespace \
{ \
EffectCondition CONCAT(_effectCondition, __LINE__)(conditionType, condition, failReason); \
}

class EffectCondition;
Expand All @@ -27,11 +27,11 @@ class EffectCondition
{
const EffectConditionType ConditionType = EffectConditionType::None;
const std::function<bool()> Condition;
const std::string Description;
const std::string FailReason;

public:
EffectCondition(EffectConditionType conditionType, std::function<bool()> condition, std::string description)
: ConditionType(conditionType), Condition(condition), Description(description)
EffectCondition(EffectConditionType conditionType, std::function<bool()> condition, std::string failReason)
: ConditionType(conditionType), Condition(condition), FailReason(failReason)
{
if (conditionType == EffectConditionType::None)
{
Expand All @@ -54,9 +54,9 @@ class EffectCondition
g_EffectConditions[ConditionType] = this;
}

inline std::string GetDescription()
inline std::string GetFailReason()
{
return Description;
return FailReason;
}

~EffectCondition()
Expand Down
2 changes: 1 addition & 1 deletion ChaosMod/Effects/EnabledEffects.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ inline std::string GetFilterReason(EffectIdentifier id)
if (effectData.ConditionType == EffectConditionType::None)
return "";

return g_EffectConditions.at(effectData.ConditionType)->GetDescription();
return g_EffectConditions.at(effectData.ConditionType)->GetFailReason();
}

0 comments on commit b10ed6d

Please sign in to comment.