Merge a82628adaa into 4bf88801ed

src/object/client/CGPlayer.cpp

@@ -41,10 +41,6 @@ uint32_t CGPlayer::TotalRemoteFieldsSaved() {
     return CGPlayer::GetBaseOffsetSaved() + 173;
 }
 
-uint32_t CGPlayer::GetMoney() const {
-    return this->Player()->coinage;
-}
-
 uint32_t CGPlayer::GetNextLevelXP() const {
     return this->Player()->nextLevelXP;
 }

src/object/client/CGPlayer.hpp

@@ -149,7 +149,6 @@ class CGPlayer {
         static uint32_t TotalRemoteFieldsSaved();
 
         // Public member functions
-        uint32_t GetMoney() const;
         uint32_t GetNextLevelXP() const;
         uint32_t GetXP() const;
 

src/object/client/CGPlayer_C.cpp

@@ -6,12 +6,6 @@
 #include "ui/Game.hpp"
 #include <storm/Error.hpp>
 
-CGPlayer_C* CGPlayer_C::GetActivePtr() {
-    return static_cast<CGPlayer_C*>(
-        ClntObjMgrObjectPtr(ClntObjMgrGetActivePlayer(), TYPE_PLAYER, __FILE__, __LINE__)
-    );
-}
-
 CGPlayer_C::CGPlayer_C(uint32_t time, CClientObjCreate& objCreate) : CGUnit_C(time, objCreate) {
     // TODO
 }
@@ -20,28 +14,20 @@ CGPlayer_C::~CGPlayer_C() {
     // TODO
 }
 
-uint32_t CGPlayer_C::GetMoney() const {
+uint32_t CGPlayer_C::GetActiveNextLevelXP() const {
     if (this->GetGUID() != ClntObjMgrGetActivePlayer()) {
         return 0;
     }
 
-    return this->CGPlayer::GetMoney();
+    return this->GetNextLevelXP();
 }
 
-uint32_t CGPlayer_C::GetNextLevelXP() const {
+uint32_t CGPlayer_C::GetActiveXP() const {
     if (this->GetGUID() != ClntObjMgrGetActivePlayer()) {
         return 0;
     }
 
-    return this->CGPlayer::GetNextLevelXP();
-}
-
-uint32_t CGPlayer_C::GetXP() const {
-    if (this->GetGUID() != ClntObjMgrGetActivePlayer()) {
-        return 0;
-    }
-
-    return this->CGPlayer::GetXP();
+    return this->GetXP();
 }
 
 void CGPlayer_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {

src/object/client/CGPlayer_C.hpp

@@ -10,17 +10,13 @@ class CreatureModelDataRec;
 
 class CGPlayer_C : public CGUnit_C, public CGPlayer {
     public:
-        // Public static functions
-        static CGPlayer_C* GetActivePtr();
-
         // Virtual public member functions
         virtual ~CGPlayer_C();
 
         // Public member functions
         CGPlayer_C(uint32_t time, CClientObjCreate& objCreate);
-        uint32_t GetMoney() const;
-        uint32_t GetNextLevelXP() const;
-        uint32_t GetXP() const;
+        uint32_t GetActiveNextLevelXP() const;
+        uint32_t GetActiveXP() const;
         void PostInit(uint32_t time, const CClientObjCreate& init, bool a4);
         void PostInitActivePlayer();
         void SetStorage(uint32_t* storage, uint32_t* saved);

src/ui/game/CGGameUI.cpp

@@ -25,7 +25,6 @@
 #include <common/MD5.hpp>
 
 WOWGUID CGGameUI::s_currentObjectTrack;
-uint32_t CGGameUI::s_cursorMoney;
 CScriptObject* CGGameUI::s_gameTooltip;
 bool CGGameUI::s_inWorld;
 WOWGUID CGGameUI::s_lockedTarget;
@@ -95,10 +94,6 @@ WOWGUID& CGGameUI::GetCurrentObjectTrack() {
     return CGGameUI::s_currentObjectTrack;
 }
 
-uint32_t CGGameUI::GetCursorMoney() {
-    return CGGameUI::s_cursorMoney;
-}
-
 WOWGUID& CGGameUI::GetLockedTarget() {
     return CGGameUI::s_lockedTarget;
 }

src/ui/game/CGGameUI.hpp

@@ -15,7 +15,6 @@ class CGGameUI {
         // Static functions
         static void EnterWorld();
         static WOWGUID& GetCurrentObjectTrack();
-        static uint32_t GetCursorMoney();
         static WOWGUID& GetLockedTarget();
         static void Initialize();
         static void InitializeGame();
@@ -26,7 +25,6 @@ class CGGameUI {
 
     private:
         static WOWGUID s_currentObjectTrack;
-        static uint32_t s_cursorMoney;
         static bool s_inWorld;
         static WOWGUID s_lockedTarget;
         static bool s_loggingIn;

src/ui/game/GameScript.cpp

@@ -3,7 +3,6 @@
 #include "gx/Coordinate.hpp"
 #include "ui/FrameScript.hpp"
 #include "ui/ScriptFunctionsShared.hpp"
-#include "ui/game/CGGameUI.hpp"
 #include "ui/simple/CSimpleTop.hpp"
 #include "util/StringTo.hpp"
 #include "util/Unimplemented.hpp"
@@ -503,9 +502,7 @@ int32_t Script_ForceQuit(lua_State* L) {
 }
 
 int32_t Script_GetCursorMoney(lua_State* L) {
-    lua_pushnumber(L, CGGameUI::GetCursorMoney());
-
-    return 1;
+    WHOA_UNIMPLEMENTED(0);
 }
 
 int32_t Script_DropCursorMoney(lua_State* L) {

src/ui/game/ScriptEvents.cpp

@@ -189,7 +189,7 @@ int32_t Script_UnitXP(lua_State* L) {
     float xp = 0.0f;
 
     if (unit && unit->IsA(TYPE_PLAYER)) {
-        xp = static_cast<CGPlayer_C*>(unit)->GetXP();
+        xp = static_cast<CGPlayer_C*>(unit)->GetActiveXP();
     }
 
     lua_pushnumber(L, xp);
@@ -209,7 +209,7 @@ int32_t Script_UnitXPMax(lua_State* L) {
     float xpMax = 0.0f;
 
     if (unit && unit->IsA(TYPE_PLAYER)) {
-        xpMax = static_cast<CGPlayer_C*>(unit)->GetNextLevelXP();
+        xpMax = static_cast<CGPlayer_C*>(unit)->GetActiveNextLevelXP();
     }
 
     lua_pushnumber(L, xpMax);
@@ -282,15 +282,7 @@ int32_t Script_UnitLevel(lua_State* L) {
 }
 
 int32_t Script_GetMoney(lua_State* L) {
-    auto player = CGPlayer_C::GetActivePtr();
-
-    if (player) {
-        lua_pushnumber(L, player->GetMoney());
-    } else {
-        lua_pushnumber(L, 0.0f);
-    }
-
-    return 1;
+    WHOA_UNIMPLEMENTED(0);
 }
 
 int32_t Script_GetHonorCurrency(lua_State* L) {