Compare commits

...

3 Commits

Author SHA1 Message Date
fallenoak
cda8fff096
feat(ui): implement Script_GetCursorMoney
Some checks are pending
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:cl compiler_name:MSVC cxx:cl os:windows-latest system_name:Windows test_path:WhoaTest]) (push) Waiting to run
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:clang compiler_name:Clang cxx:clang++ os:macos-latest system_name:macOS test_path:WhoaTest]) (push) Waiting to run
Push / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }} (map[build_type:Release cc:gcc compiler_name:GCC cxx:g++ os:ubuntu-latest system_name:Linux test_path:WhoaTest]) (push) Waiting to run
2026-02-06 15:35:17 -06:00
fallenoak
5ee4c54827
feat(ui): implement Script_GetMoney 2026-02-06 14:04:52 -06:00
fallenoak
68ad71090e
feat(object): simplify getters in CGPlayer_C 2026-02-06 10:36:54 -06:00
8 changed files with 51 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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