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

Eluna add mangos support. Notice that old MANGOS is now CMANGOS

Browse Source
This commit is contained in:
Rochet2
2014-06-29 14:16:59 +03:00
committed by Foereaper
parent 1f75dc7843
commit 8fe509c838
4 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CreatureMethods.h
View File

@@ -42,7 +42,11 @@ namespace LuaCreature
{ {
Unit* target = Eluna::CHECKOBJ<Unit>(L, 2); Unit* target = Eluna::CHECKOBJ<Unit>(L, 2);
#ifdef MANGOS
Eluna::Push(L, creature->IsTargetableForAttack(target));
#else
Eluna::Push(L, creature->isTargetableForAttack(target)); Eluna::Push(L, creature->isTargetableForAttack(target));
#endif
return 1; return 1;
} }
@@ -333,7 +337,11 @@ namespace LuaCreature
float dist = Eluna::CHECKVAL<float>(L, 5, 0.0f); float dist = Eluna::CHECKVAL<float>(L, 5, 0.0f);
int32 aura = Eluna::CHECKVAL<int32>(L, 6, 0); int32 aura = Eluna::CHECKVAL<int32>(L, 6, 0);
#ifdef MANGOS
ThreatList const& threatlist = creature->GetThreatManager().getThreatList();
#else
ThreatList const& threatlist = creature->getThreatManager().getThreatList(); ThreatList const& threatlist = creature->getThreatManager().getThreatList();
#endif
if (threatlist.empty()) if (threatlist.empty())
return 1; return 1;
if (position >= threatlist.size()) if (position >= threatlist.size())
@@ -407,11 +415,15 @@ namespace LuaCreature
lua_newtable(L); lua_newtable(L);
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 i = 0; uint32 i = 0;
ThreatList const& threatList = creature->getThreatManager().getThreatList(); #ifdef MANGOS
if (threatList.empty()) ThreatList const& threatlist = creature->GetThreatManager().getThreatList();
#else
ThreatList const& threatlist = creature->getThreatManager().getThreatList();
#endif
if (threatlist.empty())
return 1; return 1;
for (ThreatList::const_iterator itr = threatList.begin(); itr != threatList.end(); ++itr) for (ThreatList::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{ {
Unit* target = (*itr)->getTarget(); Unit* target = (*itr)->getTarget();
if (!target) if (!target)
@@ -428,7 +440,11 @@ namespace LuaCreature
int GetAITargetsCount(lua_State* L, Creature* creature) int GetAITargetsCount(lua_State* L, Creature* creature)
{ {
#ifdef MANGOS
Eluna::Push(L, creature->GetThreatManager().getThreatList().size());
#else
Eluna::Push(L, creature->getThreatManager().getThreatList().size()); Eluna::Push(L, creature->getThreatManager().getThreatList().size());
#endif
return 1; return 1;
} }

2
LuaEngine.h
View File

@@ -484,7 +484,7 @@ public:
return false; return false;
if (Unit* unit = u->ToUnit()) if (Unit* unit = u->ToUnit())
{ {
#ifndef TRINITY #ifdef CMANGOS
if (!unit->isAlive()) if (!unit->isAlive())
return false; return false;
#else #else

4
PlayerMethods.h
View File

@@ -331,7 +331,11 @@ namespace LuaPlayer
int IsTaxiCheater(lua_State* L, Player* player) int IsTaxiCheater(lua_State* L, Player* player)
{ {
#ifdef MANGOS
Eluna::Push(L, player->IsTaxiCheater());
#else
Eluna::Push(L, player->isTaxiCheater()); Eluna::Push(L, player->isTaxiCheater());
#endif
return 1; return 1;
} }

54
UnitMethods.h
View File

@@ -49,10 +49,14 @@ namespace LuaUnit
int IsRooted(lua_State* L, Unit* unit) int IsRooted(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef TRINITY
Eluna::Push(L, unit->isInRoots() || unit->IsRooted());
#else
Eluna::Push(L, unit->isInRoots() || unit->HasUnitMovementFlag(MOVEMENTFLAG_ROOT)); Eluna::Push(L, unit->isInRoots() || unit->HasUnitMovementFlag(MOVEMENTFLAG_ROOT));
#endif
#ifdef CMANGOS
Eluna::Push(L, unit->isInRoots() || unit->IsRooted());
#endif
#ifdef MANGOS
Eluna::Push(L, unit->IsInRoots() || unit->IsRooted());
#endif #endif
return 1; return 1;
} }
@@ -96,7 +100,7 @@ namespace LuaUnit
int IsGuildMaster(lua_State* L, Unit* unit) int IsGuildMaster(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isGuildMaster()); Eluna::Push(L, unit->isGuildMaster());
#else #else
Eluna::Push(L, unit->IsGuildMaster()); Eluna::Push(L, unit->IsGuildMaster());
@@ -106,7 +110,7 @@ namespace LuaUnit
int IsInnkeeper(lua_State* L, Unit* unit) int IsInnkeeper(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isInnkeeper()); Eluna::Push(L, unit->isInnkeeper());
#else #else
Eluna::Push(L, unit->IsInnkeeper()); Eluna::Push(L, unit->IsInnkeeper());
@@ -116,7 +120,7 @@ namespace LuaUnit
int IsTrainer(lua_State* L, Unit* unit) int IsTrainer(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isTrainer()); Eluna::Push(L, unit->isTrainer());
#else #else
Eluna::Push(L, unit->IsTrainer()); Eluna::Push(L, unit->IsTrainer());
@@ -126,7 +130,7 @@ namespace LuaUnit
int IsGossip(lua_State* L, Unit* unit) int IsGossip(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isGossip()); Eluna::Push(L, unit->isGossip());
#else #else
Eluna::Push(L, unit->IsGossip()); Eluna::Push(L, unit->IsGossip());
@@ -136,7 +140,7 @@ namespace LuaUnit
int IsTaxi(lua_State* L, Unit* unit) int IsTaxi(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isTaxi()); Eluna::Push(L, unit->isTaxi());
#else #else
Eluna::Push(L, unit->IsTaxi()); Eluna::Push(L, unit->IsTaxi());
@@ -146,7 +150,7 @@ namespace LuaUnit
int IsSpiritHealer(lua_State* L, Unit* unit) int IsSpiritHealer(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isSpiritHealer()); Eluna::Push(L, unit->isSpiritHealer());
#else #else
Eluna::Push(L, unit->IsSpiritHealer()); Eluna::Push(L, unit->IsSpiritHealer());
@@ -156,7 +160,7 @@ namespace LuaUnit
int IsSpiritGuide(lua_State* L, Unit* unit) int IsSpiritGuide(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isSpiritGuide()); Eluna::Push(L, unit->isSpiritGuide());
#else #else
Eluna::Push(L, unit->IsSpiritGuide()); Eluna::Push(L, unit->IsSpiritGuide());
@@ -166,7 +170,7 @@ namespace LuaUnit
int IsTabardDesigner(lua_State* L, Unit* unit) int IsTabardDesigner(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isTabardDesigner()); Eluna::Push(L, unit->isTabardDesigner());
#else #else
Eluna::Push(L, unit->IsTabardDesigner()); Eluna::Push(L, unit->IsTabardDesigner());
@@ -176,7 +180,7 @@ namespace LuaUnit
int IsServiceProvider(lua_State* L, Unit* unit) int IsServiceProvider(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isServiceProvider()); Eluna::Push(L, unit->isServiceProvider());
#else #else
Eluna::Push(L, unit->IsServiceProvider()); Eluna::Push(L, unit->IsServiceProvider());
@@ -186,7 +190,7 @@ namespace LuaUnit
int IsSpiritService(lua_State* L, Unit* unit) int IsSpiritService(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isSpiritService()); Eluna::Push(L, unit->isSpiritService());
#else #else
Eluna::Push(L, unit->IsSpiritService()); Eluna::Push(L, unit->IsSpiritService());
@@ -196,7 +200,7 @@ namespace LuaUnit
int IsAlive(lua_State* L, Unit* unit) int IsAlive(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isAlive()); Eluna::Push(L, unit->isAlive());
#else #else
Eluna::Push(L, unit->IsAlive()); Eluna::Push(L, unit->IsAlive());
@@ -206,7 +210,11 @@ namespace LuaUnit
int IsDead(lua_State* L, Unit* unit) int IsDead(lua_State* L, Unit* unit)
{ {
#ifdef MANGOS
Eluna::Push(L, unit->IsDead());
#else
Eluna::Push(L, unit->isDead()); Eluna::Push(L, unit->isDead());
#endif
return 1; return 1;
} }
@@ -218,7 +226,7 @@ namespace LuaUnit
int IsBanker(lua_State* L, Unit* unit) int IsBanker(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isBanker()); Eluna::Push(L, unit->isBanker());
#else #else
Eluna::Push(L, unit->IsBanker()); Eluna::Push(L, unit->IsBanker());
@@ -228,7 +236,7 @@ namespace LuaUnit
int IsVendor(lua_State* L, Unit* unit) int IsVendor(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isVendor()); Eluna::Push(L, unit->isVendor());
#else #else
Eluna::Push(L, unit->IsVendor()); Eluna::Push(L, unit->IsVendor());
@@ -238,7 +246,7 @@ namespace LuaUnit
int IsBattleMaster(lua_State* L, Unit* unit) int IsBattleMaster(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isBattleMaster()); Eluna::Push(L, unit->isBattleMaster());
#else #else
Eluna::Push(L, unit->IsBattleMaster()); Eluna::Push(L, unit->IsBattleMaster());
@@ -248,7 +256,7 @@ namespace LuaUnit
int IsCharmed(lua_State* L, Unit* unit) int IsCharmed(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isCharmed()); Eluna::Push(L, unit->isCharmed());
#else #else
Eluna::Push(L, unit->IsCharmed()); Eluna::Push(L, unit->IsCharmed());
@@ -258,7 +266,7 @@ namespace LuaUnit
int IsArmorer(lua_State* L, Unit* unit) int IsArmorer(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isArmorer()); Eluna::Push(L, unit->isArmorer());
#else #else
Eluna::Push(L, unit->IsArmorer()); Eluna::Push(L, unit->IsArmorer());
@@ -292,7 +300,7 @@ namespace LuaUnit
int IsInCombat(lua_State* L, Unit* unit) int IsInCombat(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isInCombat()); Eluna::Push(L, unit->isInCombat());
#else #else
Eluna::Push(L, unit->IsInCombat()); Eluna::Push(L, unit->IsInCombat());
@@ -320,7 +328,7 @@ namespace LuaUnit
int IsQuestGiver(lua_State* L, Unit* unit) int IsQuestGiver(lua_State* L, Unit* unit)
{ {
#ifndef TRINITY #ifdef CMANGOS
Eluna::Push(L, unit->isQuestGiver()); Eluna::Push(L, unit->isQuestGiver());
#else #else
Eluna::Push(L, unit->IsQuestGiver()); Eluna::Push(L, unit->IsQuestGiver());
@@ -1174,7 +1182,11 @@ namespace LuaUnit
/* OTHER */ /* OTHER */
int ClearThreatList(lua_State* /*L*/, Unit* unit) int ClearThreatList(lua_State* /*L*/, Unit* unit)
{ {
#ifdef MANGOS
unit->GetThreatManager().clearReferences();
#else
unit->getThreatManager().clearReferences(); unit->getThreatManager().clearReferences();
#endif
return 0; return 0;
} }