From 16b65145890f90ed29dcc8b5460b0dd97487d9a3 Mon Sep 17 00:00:00 2001
From: Rochet2 <tqbattlenet@gmail.com>
Date: Mon, 7 Apr 2014 02:35:29 +0300
Subject: [PATCH] Eluna fix mangos wotlk build

---
 GroupMethods.h   |  2 +-
 HookMgr.cpp      |  4 ++--
 LuaEngine.h      |  1 +
 LuaFunctions.cpp |  2 --
 ObjectMethods.h  | 16 ----------------
 PlayerMethods.h  |  4 ++--
 UnitMethods.h    |  4 ++++
 7 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/GroupMethods.h b/GroupMethods.h
index 0708394..a2aa9c9 100644
--- a/GroupMethods.h
+++ b/GroupMethods.h
@@ -231,7 +231,7 @@ namespace LuaGroup
         if (icon >= TARGETICONCOUNT)
             return luaL_argerror(L, 2, "valid target icon expected");
 
-        group->SetTargetIcon(icon, setter, target);
+        group->SetTargetIcon(icon, ObjectGuid(setter), ObjectGuid(target));
         return 0;
     }
 
diff --git a/HookMgr.cpp b/HookMgr.cpp
index 17e960c..ac47b97 100644
--- a/HookMgr.cpp
+++ b/HookMgr.cpp
@@ -350,7 +350,7 @@ void HookMgr::HandleGossipSelectOption(Player* pPlayer, Item* item, uint32 sende
         sEluna->Push(sEluna->L, sender);
         sEluna->Push(sEluna->L, action);
         if (code.empty())
-            lua_pushnil(sEluna->L);
+            sEluna->Push(sEluna->L);
         else
             sEluna->Push(sEluna->L, code);
         sEluna->ExecuteCall(6, 0);
@@ -371,7 +371,7 @@ void HookMgr::HandleGossipSelectOption(Player* pPlayer, uint32 menuId, uint32 se
         sEluna->Push(sEluna->L, sender);
         sEluna->Push(sEluna->L, action);
         if (code.empty())
-            lua_pushnil(sEluna->L);
+            sEluna->Push(sEluna->L);
         else
             sEluna->Push(sEluna->L, code);
         sEluna->Push(sEluna->L, menuId);
diff --git a/LuaEngine.h b/LuaEngine.h
index 24b7937..8191de3 100644
--- a/LuaEngine.h
+++ b/LuaEngine.h
@@ -91,6 +91,7 @@ typedef std::set<std::string> LoadedScripts;
 #define MAX_LOCALES             MAX_LOCALE
 #define OVERRIDE                override
 #define DIALOG_STATUS_SCRIPTED_NO_STATUS    DIALOG_STATUS_UNDEFINED
+#define TARGETICONCOUNT         TARGET_ICON_COUNT
 typedef TemporarySummon TempSummon;
 #ifndef CLASSIC
 #define PLAYER_FIELD_LIFETIME_HONORABLE_KILLS   PLAYER_FIELD_LIFETIME_HONORBALE_KILLS
diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index 8fac5c0..2232e63 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -142,8 +142,6 @@ ElunaRegister<Object> ObjectMethods[] =
     { "ToPlayer", &LuaObject::ToPlayer },                     // :ToPlayer()
     { "ToCorpse", &LuaObject::ToCorpse },                     // :ToCorpse()
     { "RemoveFlag", &LuaObject::RemoveFlag },                 // :RemoveFlag(index, flag)
-    { "RemoveUInt64Value", &LuaObject::RemoveUInt64Value },   // :RemoveUInt64Value(index, value)
-    { "AddUInt64Value", &LuaObject::AddUInt64Value },         // :AddUInt64Value(index, value)
 
     { NULL, NULL },
 };
diff --git a/ObjectMethods.h b/ObjectMethods.h
index dc5b633..f5cc0e3 100644
--- a/ObjectMethods.h
+++ b/ObjectMethods.h
@@ -225,21 +225,5 @@ namespace LuaObject
         sEluna->Push(L, obj->ToPlayer());
         return 1;
     }
-
-    int RemoveUInt64Value(lua_State* L, Object* obj)
-    {
-        uint16 index = sEluna->CHECKVAL<uint16>(L, 2);
-        uint64 value = sEluna->CHECKVAL<uint64>(L, 3);
-        obj->RemoveUInt64Value(index, value);
-        return 0;
-    }
-
-    int AddUInt64Value(lua_State* L, Object* obj)
-    {
-        uint16 index = sEluna->CHECKVAL<uint16>(L, 2);
-        uint64 value = sEluna->CHECKVAL<uint64>(L, 3);
-        obj->AddUInt64Value(index, value);
-        return 0;
-    }
 };
 #endif
diff --git a/PlayerMethods.h b/PlayerMethods.h
index 480e199..2df57fb 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -2072,9 +2072,9 @@ namespace LuaPlayer
         WorldPacket data(SMSG_MESSAGECHAT, 100);
         data << uint8(channel);
         data << int32(LANG_ADDON);
-        data << uint64(player->GetGUID());
+        data << uint64(player->GET_GUID());
         data << uint32(0);
-        data << uint64(receiver->GetGUID());
+        data << uint64(receiver->GET_GUID());
         data << uint32(fullmsg.length() + 1);
         data << fullmsg;
         data << uint8(0);
diff --git a/UnitMethods.h b/UnitMethods.h
index 841184d..764115d 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -1251,7 +1251,11 @@ namespace LuaUnit
             return luaL_argerror(L, 3, "valid Language expected");
 
         WorldPacket data;
+#ifdef TRINITY
         ChatHandler::BuildChatPacket(data, ChatMsg(type), Language(lang), unit, target, msg);
+#else
+        ChatHandler::BuildChatPacket(data, ChatMsg(type), msg.c_str(), Language(lang), 0, unit->GET_GUID(), unit->GetName(), target->GET_GUID(), target->GetName());
+#endif
         target->GetSession()->SendPacket(&data);
         return 0;
     }