Eluna Try to decide with the cases already!

This commit is contained in:
Rochet2
2014-08-04 20:23:45 +03:00
parent 7866ac5656
commit 4acbb496f3

View File

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