yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cmangos wotlk build

Browse Source
This commit is contained in:
Rochet2
2016-12-16 18:44:25 +02:00
parent b6270285f8
commit 0e78349861
3 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ElunaIncludes.h
View File

@@ -128,6 +128,10 @@ typedef ThreatContainer::StorageType ThreatList;
#define SPELL_AURA_MOD_KILL_XP_PCT SPELL_AURA_MOD_XP_PCT #define SPELL_AURA_MOD_KILL_XP_PCT SPELL_AURA_MOD_XP_PCT
#endif #endif
#ifdef WOTLK
#define UNIT_BYTE2_FLAG_SANCTUARY UNIT_BYTE2_FLAG_SUPPORTABLE
#endif
typedef TemporarySummon TempSummon; typedef TemporarySummon TempSummon;
typedef SpellEntry SpellInfo; typedef SpellEntry SpellInfo;
enum SelectAggroTarget enum SelectAggroTarget

4
PlayerMethods.h
View File

@@ -3877,7 +3877,11 @@ namespace LuaPlayer
data << uint32(0); // unk data << uint32(0); // unk
data << uint8(0); // count data << uint8(0); // count
data << uint32(0); // unk data << uint32(0); // unk
#ifdef CMANGOS
invited->GetSession()->SendPacket(data);
#else
invited->GetSession()->SendPacket(&data); invited->GetSession()->SendPacket(&data);
#endif
#endif #endif
} }

28
UnitMethods.h
View File

@@ -2177,8 +2177,12 @@ namespace LuaUnit
float maxHeight = Eluna::CHECKVAL<float>(L, 6); float maxHeight = Eluna::CHECKVAL<float>(L, 6);
uint32 id = Eluna::CHECKVAL<uint32>(L, 7, 0); uint32 id = Eluna::CHECKVAL<uint32>(L, 7, 0);
#if defined(CMANGOS) && defined(WOTLK)
unit->GetMotionMaster()->MoveJump(x, y, z, zSpeed, maxHeight, id);
#else
Position pos(x, y, z); Position pos(x, y, z);
unit->GetMotionMaster()->MoveJump(pos, zSpeed, maxHeight, id); unit->GetMotionMaster()->MoveJump(pos, zSpeed, maxHeight, id);
#endif
return 0; return 0;
} }
#endif #endif
@@ -2286,7 +2290,11 @@ namespace LuaUnit
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2, NULL); Unit* target = Eluna::CHECKOBJ<Unit>(L, 2, NULL);
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);
#if defined(CMANGOS) && defined(WOTLK)
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell); SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif
if (!spellEntry) if (!spellEntry)
return 0; return 0;
@@ -2419,7 +2427,11 @@ 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);
#if defined(CMANGOS) && defined(WOTLK)
SpellEntry const* spellInfo = GetSpellStore()->LookupEntry<SpellEntry>(spellId);
#else
SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId); SpellEntry const* spellInfo = sSpellStore.LookupEntry(spellId);
#endif
if (!spellInfo) if (!spellInfo)
return 1; return 1;
@@ -2657,8 +2669,13 @@ namespace LuaUnit
bool critical = Eluna::CHECKVAL<bool>(L, 5, false); bool critical = Eluna::CHECKVAL<bool>(L, 5, false);
#ifndef TRINITY #ifndef TRINITY
if (const SpellInfo* info = sSpellStore.LookupEntry(spell)) #if defined(CMANGOS) && defined(WOTLK)
unit->DealHeal(target, amount, info, critical); SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif
if (spellEntry)
unit->DealHeal(target, amount, spellEntry, critical);
#else #else
if (const SpellInfo* info = sSpellMgr->GetSpellInfo(spell)) if (const SpellInfo* info = sSpellMgr->GetSpellInfo(spell))
{ {
@@ -2725,7 +2742,12 @@ namespace LuaUnit
#ifdef TRINITY #ifdef TRINITY
unit->AddThreat(victim, threat, (SpellSchoolMask)schoolMask, spell ? sSpellMgr->GetSpellInfo(spell) : NULL); unit->AddThreat(victim, threat, (SpellSchoolMask)schoolMask, spell ? sSpellMgr->GetSpellInfo(spell) : NULL);
#else #else
unit->AddThreat(victim, threat, false, (SpellSchoolMask)schoolMask, spell ? sSpellStore.LookupEntry(spell) : NULL); #if defined(CMANGOS) && defined(WOTLK)
SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
#else
SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
#endif
unit->AddThreat(victim, threat, false, (SpellSchoolMask)schoolMask, spellEntry);
#endif #endif
return 0; return 0;
} }