From 46dec5a8196964a56d62c719f45ba35d88385d9d Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 24 Nov 2008 15:15:09 -0600 Subject: *Fix arcane charge. *SetInCombatWith in dozoneincombat. --HG-- branch : trunk --- src/bindings/scripts/include/sc_creature.cpp | 6 ++++++ src/game/SpellEffects.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index ca7dc435b09..b3fd3723466 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -671,9 +671,15 @@ void ScriptedAI::DoZoneInCombat(Unit* pUnit) Map::PlayerList const &PlayerList = map->GetPlayers(); for(Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) + { if (Player* i_pl = i->getSource()) if (!i_pl->isAlive()) + { + pUnit->SetInCombatWith(i_pl); + i_pl->SetInCombatWith(pUnit); pUnit->AddThreat(i_pl, 0.0f); + } + } } void ScriptedAI::DoResetThreat() diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 56d8c415503..d7ed4f3af4c 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -333,11 +333,11 @@ void Spell::EffectSchoolDMG(uint32 effect_idx) damage = 200; break; } - // must only affect demons (also undead?) + // arcane charge. must only affect demons (also undead?) case 45072: { if(unitTarget->GetCreatureType() != CREATURE_TYPE_DEMON - || unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD) + && unitTarget->GetCreatureType() != CREATURE_TYPE_UNDEAD) return; break; } -- cgit v1.2.3