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 merge conflicts

Browse Source
This commit is contained in:
Rochet2
2014-08-09 01:28:25 +03:00
parent 30e5c418ba a46e0074b9
commit 42fcbb70ee
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
UnitMethods.h
View File

@@ -555,12 +555,12 @@ namespace LuaUnit
Powers PowerSelectorHelper(lua_State* L, Unit* unit, int powerType = -1)
{
#if (!defined(TRINITY) && defined(WOTLK))
if (powerType == -1)
return unit->GetPowerType();
#else
#ifdef TRINITY
if (powerType == -1)
return unit->getPowerType();
#else
if (powerType == -1)
return unit->GetPowerType();
#endif
if (powerType < 0 || powerType >= int(MAX_POWERS))
@@ -603,10 +603,10 @@ namespace LuaUnit
int GetPowerType(lua_State* L, Unit* unit)
{
#if (!defined(TRINITY) && defined(WOTLK))
Eluna::Push(L, unit->GetPowerType());
#else
#ifdef TRINITY
Eluna::Push(L, unit->getPowerType());
#else
Eluna::Push(L, unit->GetPowerType());
#endif
return 1;
}
@@ -919,10 +919,11 @@ namespace LuaUnit
uint32 type = Eluna::CHECKVAL<uint32>(L, 2);
if (type >= int(MAX_POWERS))
return luaL_argerror(L, 2, "valid Powers expected");
#if (!defined(TRINITY) && defined(WOTLK))
unit->SetPowerType((Powers)type);
#else
#ifdef TRINITY
unit->setPowerType((Powers)type);
#else
unit->SetPowerType((Powers)type);
#endif
return 0;
}