Eluna merged with TC

Certain chat methods had parameter changes. Most of these changes will be updated soon to lift the conflict between versions.
This commit is contained in:
emudevs
2014-09-15 00:22:03 -04:00
parent bc5d1b3f86
commit 7c0d2cb523
3 changed files with 37 additions and 7 deletions

View File

@@ -1744,9 +1744,16 @@ namespace LuaPlayer
{
std::string text = Eluna::CHECKVAL<std::string>(L, 2);
uint32 lang = Eluna::CHECKVAL<uint32>(L, 3);
#ifdef TRINITY
Player* receiver = Eluna::CHECKOBJ<Player>(L, 4);
#else
uint64 guid = Eluna::CHECKVAL<uint64>(L, 4);
#endif
#ifdef TRINITY
player->Whisper(text, (Language)lang, receiver);
#else
player->Whisper(text, lang, ObjectGuid(guid));
#endif
return 0;
}
@@ -1762,8 +1769,11 @@ namespace LuaPlayer
{
std::string text = Eluna::CHECKVAL<std::string>(L, 2);
uint32 lang = Eluna::CHECKVAL<uint32>(L, 3);
#ifdef TRINITY
player->Yell(text, (Language)lang);
#else
player->Yell(text, lang);
#endif
return 0;
}
@@ -1771,8 +1781,11 @@ namespace LuaPlayer
{
std::string text = Eluna::CHECKVAL<std::string>(L, 2);
uint32 lang = Eluna::CHECKVAL<uint32>(L, 3);
#ifdef TRINITY
player->Say(text, (Language)lang);
#else
player->Say(text, lang);
#endif
return 0;
}