aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQAston <qaston@gmail.com>2012-02-11 00:15:05 +0100
committerQAston <qaston@gmail.com>2012-02-11 00:15:05 +0100
commit9d455c1e6f5f841594e6de4dd128439059685c89 (patch)
tree8daa57d9708d4bcfd14ad6ced849864173ea738a
parentb362377b35e40a03fa5804f44bc6f6ccf42a45e2 (diff)
Fix build with GCC (it seems like it doesn't allow using references to temporary objects).
-rwxr-xr-xsrc/server/game/AI/EventAI/CreatureEventAI.cpp3
-rw-r--r--src/server/game/AI/SmartScripts/SmartScript.cpp3
-rwxr-xr-xsrc/server/game/Conditions/ConditionMgr.cpp3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp
index dead8b07ca1..9036448d9b4 100755
--- a/src/server/game/AI/EventAI/CreatureEventAI.cpp
+++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp
@@ -1338,7 +1338,8 @@ void CreatureEventAI::ReceiveEmote(Player* player, uint32 textEmote)
cond.mConditionValue1 = (*itr).Event.receive_emote.conditionValue1;
cond.mConditionValue2 = (*itr).Event.receive_emote.conditionValue2;
- if (cond.Meets(ConditionSourceInfo(player)))
+ ConditionSourceInfo srcInfo = ConditionSourceInfo(player);
+ if (cond.Meets(srcInfo))
{
sLog->outDebug(LOG_FILTER_DATABASE_AI, "CreatureEventAI: ReceiveEmote CreatureEventAI: Condition ok, processing");
ProcessEvent(*itr, player);
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp
index 01f301cc85d..4b15805c2c9 100644
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@@ -2792,7 +2792,8 @@ bool SmartScript::ConditionValid(Unit* u, int32 c, int32 v1, int32 v2, int32 v3)
cond.mConditionValue1 = uint32(v1);
cond.mConditionValue1 = uint32(v2);
cond.mConditionValue1 = uint32(v3);
- return cond.Meets(ConditionSourceInfo(u->ToPlayer()));
+ ConditionSourceInfo srcInfo = ConditionSourceInfo(u->ToPlayer());
+ return cond.Meets(srcInfo);
}
void SmartScript::OnUpdate(uint32 const diff)
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index be57ed5c303..8b785ebaa26 100755
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -333,7 +333,8 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo,
bool ConditionMgr::IsObjectMeetToConditions(WorldObject* object, ConditionList const& conditions)
{
- return IsObjectMeetToConditions(ConditionSourceInfo(object), conditions);
+ ConditionSourceInfo srcInfo = ConditionSourceInfo(object);
+ return IsObjectMeetToConditions(srcInfo, conditions);
}
bool ConditionMgr::IsObjectMeetToConditions(ConditionSourceInfo& sourceInfo, ConditionList const& conditions)