Revert "Fix cmangos classic build"

This reverts commit 57214b69c7.
This commit is contained in:
Rochet2
2017-01-02 13:13:12 +02:00
parent 214b5e28af
commit 6ca6f90f67

View File

@@ -2291,11 +2291,7 @@ namespace LuaUnit
uint32 spell = Eluna::CHECKVAL<uint32>(L, 3); uint32 spell = Eluna::CHECKVAL<uint32>(L, 3);
bool triggered = Eluna::CHECKVAL<bool>(L, 4, false); bool triggered = Eluna::CHECKVAL<bool>(L, 4, false);
#ifdef CMANGOS #ifdef CMANGOS
#ifdef CLASSIC
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry(spell);
#else
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#endif
#else #else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif #endif
@@ -2432,11 +2428,7 @@ namespace LuaUnit
uint32 spellId = Eluna::CHECKVAL<uint32>(L, 2); uint32 spellId = Eluna::CHECKVAL<uint32>(L, 2);
Unit* target = Eluna::CHECKOBJ<Unit>(L, 3); Unit* target = Eluna::CHECKOBJ<Unit>(L, 3);
#ifdef CMANGOS #ifdef CMANGOS
#ifdef CLASSIC
SpellEntry const* spellInfo = GetSpellStore()->LookupEntry(spellId);
#else
SpellEntry const* spellInfo = GetSpellStore()->LookupEntry<SpellEntry>(spellId); SpellEntry const* spellInfo = GetSpellStore()->LookupEntry<SpellEntry>(spellId);
#endif
#else #else
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
#endif #endif
@@ -2678,11 +2670,7 @@ namespace LuaUnit
#ifndef TRINITY #ifndef TRINITY
#ifdef CMANGOS #ifdef CMANGOS
#ifdef CLASSIC
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry(spell);
#else
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#endif
#else #else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif #endif
@@ -2755,11 +2743,7 @@ namespace LuaUnit
unit->AddThreat(victim, threat, (SpellSchoolMask)schoolMask, spell ? sSpellMgr->GetSpellInfo(spell) : NULL); unit->AddThreat(victim, threat, (SpellSchoolMask)schoolMask, spell ? sSpellMgr->GetSpellInfo(spell) : NULL);
#else #else
#ifdef CMANGOS #ifdef CMANGOS
#ifdef CLASSIC
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry(spell);
#else
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#endif
#else #else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif #endif