Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16644 from Treeston/3.3.5-customcharmai

Browse Source 
Core/UnitAI: Rework creature-controlled player behavior.
This commit is contained in:
Treeston
2016-02-24 13:39:31 +01:00
parent dab661c8da 2f14664340
commit 4e4b2b9a13
13 changed files with 304 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -22,7 +22,7 @@
*/
#include "Player.h"
#include "UnitAI.h"
#include "PlayerAI.h"
#include "ScriptMgr.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
@@ -1909,9 +1909,9 @@ public:
if (!player || player->GetGhoulResurrectGhoulGUID().IsEmpty())
return;
oldAI = player->GetAI();
oldAI = player->AI();
oldAIState = player->IsAIEnabled;
player->SetAI(new player_ghoulAI(player, player->GetGhoulResurrectGhoulGUID()));
player->SetAI(static_cast<UnitAI*>(new player_ghoulAI(player, player->GetGhoulResurrectGhoulGUID())));
player->IsAIEnabled = true;
}
@@ -1922,8 +1922,8 @@ public:
return;
player->IsAIEnabled = oldAIState;
UnitAI* thisAI = player->GetAI();
player->SetAI(oldAI);
PlayerAI* thisAI = player->AI();
player->SetAI(static_cast<UnitAI*>(oldAI));
delete thisAI;
// Dismiss ghoul if necessary
@@ -1943,7 +1943,7 @@ public:
AfterEffectRemove += AuraEffectRemoveFn(spell_dk_raise_ally_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
UnitAI* oldAI;
PlayerAI* oldAI;
bool oldAIState;
};