diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-10-25 10:59:58 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-10-31 20:26:40 +0100 |
| commit | dc74454356af726c96c83b02418d46bc664cee8e (patch) | |
| tree | 3ec58ad629632a0d0c4edab34fb74c0adfea257d /src/server/game/Globals/ObjectMgr.h | |
| parent | fc95812141e925b727235530fbea94663eb43f97 (diff) | |
Core/Conditions: Type renaming
(cherry picked from commit 5e0cee85ddd67188365ead3f18206df088e1f0c7)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.h')
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 875b5547aef..033ea482912 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -564,14 +564,14 @@ struct GossipMenuItems uint32 BoxMoney; std::string BoxText; uint32 BoxBroadcastTextId; - ConditionList Conditions; + ConditionContainer Conditions; }; struct GossipMenus { uint32 entry; uint32 text_id; - ConditionList conditions; + ConditionContainer conditions; }; typedef std::multimap<uint32, GossipMenus> GossipMenusContainer; |