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 fix TC merge changes

Browse Source
This commit is contained in:
Rochet2
2014-07-17 17:23:46 +03:00
parent 94528114c9
commit f3baa46446
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PlayerMethods.h
View File

@@ -1622,8 +1622,12 @@ namespace LuaPlayer
int ResetTalentsCost(lua_State* L, Player* player) int ResetTalentsCost(lua_State* L, Player* player)
{ {
#ifdef TRINITY
#ifdef CATA #ifdef CATA
Eluna::Push(L, player->GetNextResetTalentsCost()); Eluna::Push(L, player->GetNextResetTalentsCost());
#else
Eluna::Push(L, player->ResetTalentsCost());
#endif
#else #else
Eluna::Push(L, player->resetTalentsCost()); Eluna::Push(L, player->resetTalentsCost());
#endif #endif
@@ -1634,7 +1638,7 @@ namespace LuaPlayer
{ {
bool no_cost = Eluna::CHECKVAL<bool>(L, 2, true); bool no_cost = Eluna::CHECKVAL<bool>(L, 2, true);
#ifdef CATA #ifdef TRINITY
player->ResetTalents(no_cost); player->ResetTalents(no_cost);
#else #else
player->resetTalents(no_cost); player->resetTalents(no_cost);
@@ -1651,7 +1655,11 @@ namespace LuaPlayer
bool disabled = Eluna::CHECKVAL<bool>(L, 3, false); bool disabled = Eluna::CHECKVAL<bool>(L, 3, false);
bool learn_low_rank = Eluna::CHECKVAL<bool>(L, 4, true); bool learn_low_rank = Eluna::CHECKVAL<bool>(L, 4, true);
#ifdef TRINITY
player->RemoveSpell(entry, disabled, learn_low_rank);
#else
player->removeSpell(entry, disabled, learn_low_rank); player->removeSpell(entry, disabled, learn_low_rank);
#endif
return 0; return 0;
} }
@@ -2093,7 +2101,11 @@ namespace LuaPlayer
int LearnSpell(lua_State* L, Player* player) int LearnSpell(lua_State* L, Player* player)
{ {
uint32 id = Eluna::CHECKVAL<uint32>(L, 2); uint32 id = Eluna::CHECKVAL<uint32>(L, 2);
#ifdef TRINITY
player->LearnSpell(id, false);
#else
player->learnSpell(id, false); player->learnSpell(id, false);
#endif
return 0; return 0;
} }