Scripts/Misc: Fix some warnings with vs2014 ctp (no support)

This commit is contained in:
Vincent-Michael
2014-07-11 16:39:13 +02:00
parent e87f720f01
commit 495ca8c2dc
2 changed files with 6 additions and 21 deletions

View File

@@ -84,29 +84,20 @@ public:
InstanceScript* instance;
uint64 TerestianGUID;
uint32 AmplifyTimer;
void Reset() override
{
TerestianGUID = 0;
AmplifyTimer = 2000;
}
void EnterCombat(Unit* /*who*/) override
{
}
void EnterCombat(Unit* /*who*/) override { }
void JustDied(Unit* /*killer*/) override
{
uint64 TerestianGUID = instance->GetData64(DATA_TERESTIAN);
if (TerestianGUID)
{
Unit* Terestian = ObjectAccessor::GetUnit(*me, TerestianGUID);
if (Terestian && Terestian->IsAlive())
DoCast(Terestian, SPELL_BROKEN_PACT, true);
}
Unit* Terestian = ObjectAccessor::GetUnit(*me, instance->GetData64(DATA_TERESTIAN));
if (Terestian && Terestian->IsAlive())
DoCast(Terestian, SPELL_BROKEN_PACT, true);
}
void UpdateAI(uint32 diff) override

View File

@@ -283,8 +283,6 @@ public:
InstanceScript* instance;
uint64 TarethaGUID;
bool LowHp;
bool HadMount;
@@ -400,12 +398,8 @@ public:
me->SummonCreature(NPC_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
break;
case 94:
if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA))
{
if (Creature* Taretha = ObjectAccessor::GetCreature(*me, TarethaGUID))
Taretha->AI()->Talk(SAY_TA_ESCAPED, me);
}
break;
if (Creature* Taretha = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TARETHA)))
Taretha->AI()->Talk(SAY_TA_ESCAPED, me);
case 95:
Talk(SAY_TH_MEET_TARETHA);
instance->SetData(TYPE_THRALL_PART3, DONE);