Merge a82628adaa into 72d2c3b1a2

src/client/ClientServices.cpp

@@ -160,6 +160,10 @@ ClientConnection* ClientServices::Connection() {
     return ClientServices::s_currentConnection;
 }
 
+void ClientServices::CharacterDelete(uint64_t guid) {
+    ClientServices::Connection()->RequestCharacterDelete(guid);
+}
+
 void ClientServices::Disconnect() {
     ClientServices::Connection()->Disconnect();
 }

src/client/ClientServices.hpp

@@ -33,6 +33,7 @@ class ClientServices : public LoginResponse {
         // Static functions
         static void ConnectToSelectedServer();
         static ClientConnection* Connection();
+        static void CharacterDelete(uint64_t guid);
         static void Disconnect();
         static const char* GetCurrentLoginPortal();
         static const char* GetCurrentLoginServer();

src/glue/CCharacterSelectionScript.cpp

@@ -1,4 +1,5 @@
 #include "glue/CCharacterSelectionScript.hpp"
+#include "CGlueMgr.hpp"
 #include "db/Db.hpp"
 #include "glue/CCharacterSelection.hpp"
 #include "object/client/CGUnit_C.hpp"
@@ -157,7 +158,17 @@ int32_t Script_SelectCharacter(lua_State* L) {
 }
 
 int32_t Script_DeleteCharacter(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (!lua_isnumber(L, 1)) {
+        luaL_error(L, "Usage: DeleteCharacter(index)");
+    }
+
+    int32_t index = static_cast<int32_t>(lua_tonumber(L, 1)) - 1;
+
+    if (index >= 0 && index < CCharacterSelection::s_characterList.Count()) {
+        CGlueMgr::DeleteCharacter(CCharacterSelection::s_characterList.m_data[index].m_info.guid);
+    }
+
+    return 0;
 }
 
 int32_t Script_RenameCharacter(lua_State* L) {

src/glue/CGlueMgr.cpp

@@ -129,6 +129,17 @@ void CGlueMgr::ChangeRealm(const REALM_INFO* realmInfo) {
     ClientServices::Connection()->Connect();
 }
 
+void CGlueMgr::DeleteCharacter(uint64_t guid) {
+    if (guid) {
+        CGlueMgr::SetIdleState(IDLE_DELETE_CHARACTER);
+
+        auto text = FrameScript_GetText(ClientServices::GetErrorToken(70), -1, GENDER_NOT_APPLICABLE);
+        FrameScript_SignalEvent(OPEN_STATUS_DIALOG, "%s%s", "CANCEL", text);
+
+        ClientServices::CharacterDelete(guid);
+    }
+}
+
 void CGlueMgr::EnterWorld() {
     if (!ClientServices::GetSelectedRealm()) {
         return;

src/glue/CGlueMgr.hpp

@@ -66,6 +66,7 @@ class CGlueMgr {
         // Static functions
         static void CancelRealmListQuery();
         static void ChangeRealm(const REALM_INFO* realmInfo);
+        static void DeleteCharacter(uint64_t guid);
         static void DisplayLoginStatus();
         static void EnterWorld();
         static void GetCharacterList();

src/net/connection/ClientConnection.cpp

@@ -1,6 +1,7 @@
 #include "net/connection/ClientConnection.hpp"
-#include "net/Login.hpp"
 #include "client/ClientServices.hpp"
+#include "common/datastore/CDataStore.hpp"
+#include "net/Login.hpp"
 #include "ui/FrameScript.hpp"
 
 void ClientConnection::AccountLogin(const char* name, const char* password, int32_t region, WOW_LOCALE locale) {
@@ -160,3 +161,19 @@ int32_t ClientConnection::PollStatus(WOWCS_OPS& op, const char** msg, int32_t& r
 
     return this->m_statusComplete;
 }
+
+void ClientConnection::RequestCharacterDelete(uint64_t guid) {
+    this->Initiate(COP_DELETE_CHARACTER, 70, nullptr);
+
+    if (this->IsConnected()) {
+        CDataStore netMsg;
+        netMsg.Put(static_cast<uint32_t>(CMSG_CHAR_DELETE));
+        netMsg.Put(guid);
+        netMsg.Finalize();
+
+        this->Send(&netMsg);
+    }
+    else {
+        this->Cancel(4);
+    }
+}

src/net/connection/ClientConnection.hpp

@@ -43,6 +43,7 @@ class ClientConnection : public RealmConnection {
         void Initiate(WOWCS_OPS op, int32_t errorCode, void (*cleanup)());
         int32_t IsConnected();
         int32_t PollStatus(WOWCS_OPS& op, const char** msg, int32_t& result, int32_t& errorCode);
+        void RequestCharacterDelete(uint64_t guid);
 };
 
 #endif

src/ui/game/CGGameUI.cpp

@@ -18,6 +18,7 @@
 #include "ui/game/GMTicketInfoScript.hpp"
 #include "ui/game/GameScript.hpp"
 #include "ui/game/ScriptEvents.hpp"
+#include "ui/game/TradeInfoScript.hpp"
 #include "ui/game/Types.hpp"
 #include "ui/game/UIBindingsScript.hpp"
 #include "ui/simple/CSimpleTop.hpp"
@@ -60,6 +61,10 @@ void LoadScriptFunctions() {
 
     // TODO
 
+    TradeInfoRegisterScriptFunctions();
+
+    // TODO
+
     BattlefieldInfoRegisterScriptFunctions();
 
     // TODO

src/ui/game/CGTradeInfo.cpp

@@ -0,0 +1,12 @@
+#include "ui/game/CGTradeInfo.hpp"
+
+uint32_t CGTradeInfo::s_playerMoney;
+WOWGUID CGTradeInfo::s_tradingPlayer;
+
+uint32_t CGTradeInfo::GetPlayerTradeMoney() {
+    return CGTradeInfo::s_playerMoney;
+}
+
+WOWGUID CGTradeInfo::GetTradePartner() {
+    return CGTradeInfo::s_tradingPlayer;
+}

src/ui/game/CGTradeInfo.hpp

@@ -0,0 +1,19 @@
+#ifndef UI_GAME_C_G_TRADE_INFO_HPP
+#define UI_GAME_C_G_TRADE_INFO_HPP
+
+#include "util/GUID.hpp"
+#include <cstdint>
+
+class CGTradeInfo {
+    public:
+        // Public static functions
+        static uint32_t GetPlayerTradeMoney();
+        static WOWGUID GetTradePartner();
+
+    private:
+        // Private static variables
+        static uint32_t s_playerMoney;
+        static WOWGUID s_tradingPlayer;
+};
+
+#endif

src/ui/game/TradeInfoScript.cpp

@@ -0,0 +1,94 @@
+#include "ui/game/TradeInfoScript.hpp"
+#include "ui/FrameScript.hpp"
+#include "ui/game/CGTradeInfo.hpp"
+#include "util/Lua.hpp"
+#include "util/Unimplemented.hpp"
+
+namespace {
+
+int32_t Script_CloseTrade(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_ClickTradeButton(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_ClickTargetTradeButton(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_GetTradeTargetItemInfo(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_GetTradeTargetItemLink(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_GetTradePlayerItemInfo(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_GetTradePlayerItemLink(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_AcceptTrade(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_CancelTradeAccept(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_GetPlayerTradeMoney(lua_State* L) {
+    if (CGTradeInfo::GetTradePartner()) {
+        lua_pushnumber(L, CGTradeInfo::GetPlayerTradeMoney());
+    } else {
+        lua_pushnumber(L, 0);
+    }
+
+    return 1;
+}
+
+int32_t Script_GetTargetTradeMoney(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_PickupTradeMoney(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_AddTradeMoney(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+int32_t Script_SetTradeMoney(lua_State* L) {
+    WHOA_UNIMPLEMENTED(0);
+}
+
+}
+
+static FrameScript_Method s_ScriptFunctions[] = {
+    { "CloseTrade",             &Script_CloseTrade },
+    { "ClickTradeButton",       &Script_ClickTradeButton },
+    { "ClickTargetTradeButton", &Script_ClickTargetTradeButton },
+    { "GetTradeTargetItemInfo", &Script_GetTradeTargetItemInfo },
+    { "GetTradeTargetItemLink", &Script_GetTradeTargetItemLink },
+    { "GetTradePlayerItemInfo", &Script_GetTradePlayerItemInfo },
+    { "GetTradePlayerItemLink", &Script_GetTradePlayerItemLink },
+    { "AcceptTrade",            &Script_AcceptTrade },
+    { "CancelTradeAccept",      &Script_CancelTradeAccept },
+    { "GetPlayerTradeMoney",    &Script_GetPlayerTradeMoney },
+    { "GetTargetTradeMoney",    &Script_GetTargetTradeMoney },
+    { "PickupTradeMoney",       &Script_PickupTradeMoney },
+    { "AddTradeMoney",          &Script_AddTradeMoney },
+    { "SetTradeMoney",          &Script_SetTradeMoney },
+};
+
+void TradeInfoRegisterScriptFunctions() {
+    for (auto& func : s_ScriptFunctions) {
+        FrameScript_RegisterFunction(func.name, func.method);
+    }
+}

src/ui/game/TradeInfoScript.hpp

@@ -0,0 +1,6 @@
+#ifndef UI_GAME_TRADE_INFO_SCRIPT_HPP
+#define UI_GAME_TRADE_INFO_SCRIPT_HPP
+
+void TradeInfoRegisterScriptFunctions();
+
+#endif