Merge 0573235a70 into cda8fff096

src/ui/game/CGGameUI.cpp

@@ -18,7 +18,6 @@
 #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"
@@ -61,10 +60,6 @@ void LoadScriptFunctions() {
 
     // TODO
 
-    TradeInfoRegisterScriptFunctions();
-
-    // TODO
-
     BattlefieldInfoRegisterScriptFunctions();
 
     // TODO

src/ui/game/CGTradeInfo.cpp

@@ -1,12 +0,0 @@
-#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

@@ -1,19 +0,0 @@
-#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

@@ -1,94 +0,0 @@
-#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

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