Merge branch 'master' of git://github.com/TrinityCore/TrinityCore

3 files changed, 10 insertions, 10 deletions

diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index 9036448d9b4..730606becb5 100755
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -1334,9 +1334,9 @@ void CreatureEventAI::ReceiveEmote(Player* player, uint32 textEmote)
                 return;
 
             Condition cond;
-            cond.mConditionType = ConditionType((*itr).Event.receive_emote.condition);
-            cond.mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
-            cond.mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
+            cond.ConditionType = ConditionTypes((*itr).Event.receive_emote.condition);
+            cond.ConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
+            cond.ConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
 
             ConditionSourceInfo srcInfo = ConditionSourceInfo(player);
             if (cond.Meets(srcInfo))
diff --git a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
index 8f2cf6b471f..add7b4db174 100755
--- a/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
@@ -359,9 +359,9 @@ void CreatureEventAIMgr::LoadCreatureEventAI_Scripts()
                 if (temp.receive_emote.condition)
                 {
                     Condition cond;
-                    cond.mConditionType = ConditionType(temp.receive_emote.condition);
-                    cond.mConditionValue1 = temp.receive_emote.conditionValue1;
-                    cond.mConditionValue2 = temp.receive_emote.conditionValue2;
+                    cond.ConditionType = ConditionTypes(temp.receive_emote.condition);
+                    cond.ConditionValue1 = temp.receive_emote.conditionValue1;
+                    cond.ConditionValue2 = temp.receive_emote.conditionValue2;
                     if (!sConditionMgr->isConditionTypeValid(&cond))
                     {
                         sLog->outErrorDb("CreatureEventAI: Creature %u using event %u: param2 (Condition: %u) are not valid.", temp.creature_id, i, temp.receive_emote.condition);
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index 1cf78c4a59c..c716741371e 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -2783,10 +2783,10 @@ bool SmartScript::ConditionValid(Unit* u, int32 c, int32 v1, int32 v2, int32 v3)
     if (c == 0) return true;
     if (!u || !u->ToPlayer()) return false;
     Condition cond;
-    cond.mConditionType = ConditionType(uint32(c));
-    cond.mConditionValue1 = uint32(v1);
-    cond.mConditionValue1 = uint32(v2);
-    cond.mConditionValue1 = uint32(v3);
+    cond.ConditionType = ConditionTypes(uint32(c));
+    cond.ConditionValue1 = uint32(v1);
+    cond.ConditionValue1 = uint32(v2);
+    cond.ConditionValue1 = uint32(v3);
     ConditionSourceInfo srcInfo = ConditionSourceInfo(u->ToPlayer());
     return cond.Meets(srcInfo);
 }