diff options
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.h')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h index cedc07ed67c..1eb24ca1b92 100644 --- a/src/server/game/Conditions/ConditionMgr.h +++ b/src/server/game/Conditions/ConditionMgr.h @@ -116,6 +116,7 @@ enum ConditionTypes CONDITION_SCENE_IN_PROGRESS = 55, // SceneScriptPackageId 0 0 true if player is playing a scene with ScriptPackageId equal to given value CONDITION_PLAYER_CONDITION = 56, // PlayerConditionId 0 0 true if player satisfies PlayerCondition CONDITION_PRIVATE_OBJECT = 57, // 0 0 0 true if entity is private object + CONDITION_STRING_ID = 58, CONDITION_MAX }; @@ -251,6 +252,7 @@ struct TC_GAME_API Condition uint32 ConditionValue1; uint32 ConditionValue2; uint32 ConditionValue3; + std::string ConditionStringValue1; uint32 ErrorType; uint32 ErrorTextId; uint32 ReferenceId; @@ -335,6 +337,7 @@ class TC_GAME_API ConditionMgr bool HasConditionValue1; bool HasConditionValue2; bool HasConditionValue3; + bool HasConditionStringValue1; }; static char const* const StaticSourceTypeData[CONDITION_SOURCE_TYPE_MAX_DB_ALLOWED]; static ConditionTypeInfo const StaticConditionTypeData[CONDITION_MAX]; @@ -349,7 +352,8 @@ class TC_GAME_API ConditionMgr void addToGraveyardData(ConditionId const& id, std::shared_ptr<std::vector<Condition>> conditions) const; bool IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo, ConditionContainer const& conditions) const; - static void LogUselessConditionValue(Condition* cond, uint8 index, uint32 value); + static void LogUselessConditionValue(Condition const* cond, uint8 index, uint32 value); + static void LogUselessConditionValue(Condition const* cond, uint8 index, std::string_view value); void Clean(); // free up resources |