diff options
| author | Nayd <dnpd.dd@gmail.com> | 2015-01-28 19:29:31 +0000 |
|---|---|---|
| committer | Nayd <dnpd.dd@gmail.com> | 2015-01-28 19:29:31 +0000 |
| commit | 802725817bcdab6a838e2b86a22bbe10b03370d4 (patch) | |
| tree | badf450c35034dc897a16ff7f9064d61a5711ee6 /src/server/scripts | |
| parent | 7dc90b4efd086a7c8005705c4cf20a23daf7b333 (diff) | |
Core/Packets: Update and enable CMSG_STAND_STATE_CHANGE and SMSG_STAND_STATE_UPDATE
Diffstat (limited to 'src/server/scripts')
5 files changed, 11 insertions, 11 deletions
diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index 2f10aa858f9..7550faeaec1 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -177,7 +177,7 @@ public: if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->getStandState() == UNIT_STAND_STATE_SIT) + if (player->GetQuestStatus(5742) == QUEST_STATUS_INCOMPLETE && player->GetStandState() == UNIT_STAND_STATE_SIT) player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 4268cafa1ea..232261df951 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -547,7 +547,7 @@ public: { if (!HasEscortState(STATE_ESCORT_ESCORTING)) { - if (me->getStandState() == UNIT_STAND_STATE_DEAD) + if (me->GetStandState() == UNIT_STAND_STATE_DEAD) me->SetStandState(UNIT_STAND_STATE_STAND); IsPostEvent = false; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 3c068915585..5dcf4854943 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -353,9 +353,9 @@ static bool IsEncounterFinished(Unit* who) if (!mkii || !vx001 || !aerial) return false; - if (mkii->getStandState() == UNIT_STAND_STATE_DEAD && - vx001->getStandState() == UNIT_STAND_STATE_DEAD && - aerial->getStandState() == UNIT_STAND_STATE_DEAD) + if (mkii->GetStandState() == UNIT_STAND_STATE_DEAD && + vx001->GetStandState() == UNIT_STAND_STATE_DEAD && + aerial->GetStandState() == UNIT_STAND_STATE_DEAD) { who->Kill(mkii); who->Kill(vx001); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 9aa1981eabb..38ccf33a612 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -535,7 +535,7 @@ class boss_kaelthas : public CreatureScript case 2: Advisor = (ObjectAccessor::GetCreature(*me, m_auiAdvisorGuid[0])); - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + if (Advisor && (Advisor->GetStandState() == UNIT_STAND_STATE_DEAD)) { Talk(SAY_INTRO_SANGUINAR); @@ -569,7 +569,7 @@ class boss_kaelthas : public CreatureScript case 4: Advisor = (ObjectAccessor::GetCreature(*me, m_auiAdvisorGuid[1])); - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + if (Advisor && (Advisor->GetStandState() == UNIT_STAND_STATE_DEAD)) { Talk(SAY_INTRO_CAPERNIAN); @@ -603,7 +603,7 @@ class boss_kaelthas : public CreatureScript case 6: Advisor = (ObjectAccessor::GetCreature(*me, m_auiAdvisorGuid[2])); - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + if (Advisor && (Advisor->GetStandState() == UNIT_STAND_STATE_DEAD)) { Talk(SAY_INTRO_TELONICUS); @@ -638,7 +638,7 @@ class boss_kaelthas : public CreatureScript case 8: Advisor = (ObjectAccessor::GetCreature(*me, m_auiAdvisorGuid[3])); - if (Advisor && (Advisor->getStandState() == UNIT_STAND_STATE_DEAD)) + if (Advisor && (Advisor->GetStandState() == UNIT_STAND_STATE_DEAD)) { Phase = 2; instance->SetData(DATA_KAELTHASEVENT, 2); diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 44dd17e5624..e6e97a9d04a 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -64,7 +64,7 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader Unit* caster = GetCaster(); // If our player is no longer sit, remove all auras - if (target->getStandState() != UNIT_STAND_STATE_SIT) + if (target->GetStandState() != UNIT_STAND_STATE_SIT) { target->RemoveAura(SPELL_ROMANTIC_PICNIC_ACHIEV); target->RemoveAura(GetAura()); @@ -83,7 +83,7 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader target->VisitNearbyWorldObject(INTERACTION_DISTANCE*2, searcher); for (std::list<Player*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { - if ((*itr) != target && (*itr)->HasAura(GetId())) // && (*itr)->getStandState() == UNIT_STAND_STATE_SIT) + if ((*itr) != target && (*itr)->HasAura(GetId())) // && (*itr)->GetStandState() == UNIT_STAND_STATE_SIT) { if (caster) { |
