azerothcore/mod-ale
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eluna merged with TC

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
UnitMethods.h
View File

@@ -1307,10 +1307,15 @@ namespace LuaUnit
int SendUnitWhisper(lua_State* L, Unit* unit)
{
const char* msg = Eluna::CHECKVAL<const char*>(L, 2);
Player* receiver = Eluna::CHECKOBJ<Player>(L, 3);
bool bossWhisper = Eluna::CHECKVAL<bool>(L, 4, false);
uint32 lang = Eluna::CHECKVAL<uint32>(L, 3);
Player* receiver = Eluna::CHECKOBJ<Player>(L, 4);
bool bossWhisper = Eluna::CHECKVAL<bool>(L, 5, false);
if (std::string(msg).length() > 0)
#ifdef TRINITY
unit->Whisper(msg, (Language)lang, receiver, bossWhisper);
#else
unit->MonsterWhisper(msg, receiver, bossWhisper);
#endif
return 0;
}
@@ -1320,7 +1325,11 @@ namespace LuaUnit
Unit* receiver = Eluna::CHECKOBJ<Unit>(L, 3, false);
bool bossEmote = Eluna::CHECKVAL<bool>(L, 4, false);
if (std::string(msg).length() > 0)
#ifdef TRINITY
unit->TextEmote(msg, receiver, bossEmote);
#else
unit->MonsterTextEmote(msg, receiver, bossEmote);
#endif
return 0;
}
@@ -1329,7 +1338,11 @@ namespace LuaUnit
const char* msg = Eluna::CHECKVAL<const char*>(L, 2);
uint32 language = Eluna::CHECKVAL<uint32>(L, 3);
if (std::string(msg).length() > 0)
#ifdef TRINITY
unit->Say(msg, (Language)language, unit);
#else
unit->MonsterSay(msg, language, unit);
#endif
return 0;
}
@@ -1338,7 +1351,11 @@ namespace LuaUnit
const char* msg = Eluna::CHECKVAL<const char*>(L, 2);
uint32 language = Eluna::CHECKVAL<uint32>(L, 3);
if (std::string(msg).length() > 0)
#ifdef TRINITY
unit->Yell(msg, (Language)language, unit);
#else
unit->MonsterYell(msg, language, unit);
#endif
return 0;
}