Compare commits

...

24 Commits

Author SHA1 Message Date
Tristan 'Natrist' Cormier
962dc1e9da
Merge b902b5484e into e51df96e8d 2026-02-02 18:05:58 -05:00
fallenoak
e51df96e8d
feat(ui): implement Script_UnitExists 2026-02-02 16:46:42 -06:00
fallenoak
55e37fd779
feat(object): add CGUnit_C::CanHighlight 2026-02-02 16:46:23 -06:00
fallenoak
71b7b159de
feat(ui): add CGPetInfo 2026-02-02 16:45:58 -06:00
fallenoak
953fb372d8
feat(object): add CGUnit_C::CanBeTargetted 2026-02-02 11:41:15 -06:00
fallenoak
03bd53324a
feat(object): add CGObject_C::CanBeTargetted 2026-02-02 11:39:02 -06:00
fallenoak
1c85269d1c
feat(object): add CGObject_C::CanHighlight 2026-02-02 11:37:30 -06:00
fallenoak
87ae3b512b
feat(object): clean up data struct visibility
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-02 08:47:50 -06:00
fallenoak
4d0c48be52
feat(object): add model member to CGObject_C 2026-02-02 08:20:49 -06:00
fallenoak
6e1eb93ff9
feat(ui): implement post-token-parsing logic in Script_GetGUIDFromToken
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-01 20:22:56 -06:00
fallenoak
43cb20cd0f
feat(ui): add CGGameUI::IsRaidMemberOrPet 2026-02-01 20:22:17 -06:00
fallenoak
99c00ade9b
feat(ui): add CGGameUI::GetCurrentObjectTrack 2026-02-01 20:16:33 -06:00
fallenoak
184d3b041f
feat(ui): implement Script_UnitIsPlayer
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-01 13:05:52 -06:00
fallenoak
bc3b469266
feat(ui): add Script_GetGUIDFromToken 2026-02-01 13:05:32 -06:00
fallenoak
f5171c0c6c
feat(ui): add CGGameUI::IsRaidMember 2026-02-01 13:04:37 -06:00
fallenoak
1891bdc5ea
feat(object): add player class to object client header 2026-02-01 13:04:16 -06:00
fallenoak
e7abae1102
feat(object): add CGObject::GetGUID 2026-02-01 13:03:52 -06:00
fallenoak
0cf12c9c90
feat(ui): add CGGameUI::GetLockedTarget
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-01-31 23:47:29 -06:00
fallenoak
22eb04e495
feat(ui): implement CSimpleButton_GetFontString
Some checks failed
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) Has been cancelled
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) Has been cancelled
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) Has been cancelled
2026-01-30 21:41:01 -06:00
fallenoak
2c181e436c
feat(ui): add CGTooltip::IsA 2026-01-30 20:57:48 -06:00
fallenoak
3d7d000190
feat(ui): implement Script_RequestBattlefieldPositions 2026-01-30 20:45:05 -06:00
fallenoak
bdef61479d
feat(ui): implement CGTooltip_IsOwned 2026-01-30 19:53:03 -06:00
fallenoak
85b7537faa
feat(ui): add TOOLTIP_ANCHORPOINT 2026-01-30 19:39:49 -06:00
Tristan Cormier
b902b5484e feat(glue): implement Script_AcceptedScanning 2026-01-11 17:00:18 -05:00
44 changed files with 533 additions and 30 deletions

View File

@ -39,6 +39,7 @@
#include <cstdio>
int32_t CGlueMgr::m_acceptedEULA = 1; // TODO
int32_t CGlueMgr::m_acceptedScanning = 1; // TODO
int32_t CGlueMgr::m_acceptedTerminationWithoutNotice;
int32_t CGlueMgr::m_acceptedTOS = 1; // TODO
int32_t CGlueMgr::m_accountMsgAvailable;

View File

@ -33,6 +33,7 @@ class CGlueMgr {
// Static variables
static int32_t m_acceptedEULA;
static int32_t m_acceptedScanning;
static int32_t m_acceptedTerminationWithoutNotice;
static int32_t m_acceptedTOS;
static int32_t m_accountMsgAvailable;

View File

@ -210,7 +210,14 @@ int32_t Script_ShowScanningNotice(lua_State* L) {
}
int32_t Script_ScanningAccepted(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
if (CGlueMgr::m_acceptedScanning) {
lua_pushnumber(L, 1.0);
}
else {
lua_pushnil(L);
}
return 1;
}
int32_t Script_AcceptScanning(lua_State* L) {

View File

@ -1,6 +1,7 @@
#ifndef OBJECT_CLIENT_HPP
#define OBJECT_CLIENT_HPP
#include "client/CGPlayer_C.hpp"
#include "client/ObjMgr.hpp"
#include "object/Types.hpp"

View File

@ -24,3 +24,7 @@ uint32_t CGContainer::TotalFields() {
uint32_t CGContainer::TotalFieldsSaved() {
return CGContainer::GetBaseOffsetSaved() + 72;
}
CGContainerData* CGContainer::Container() const {
return this->m_cont;
}

View File

@ -20,9 +20,13 @@ class CGContainer {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGContainerData* m_cont;
uint32_t* m_contSaved;
// Protected member functions
CGContainerData* Container() const;
};
#endif

View File

@ -24,3 +24,7 @@ uint32_t CGCorpse::TotalFields() {
uint32_t CGCorpse::TotalFieldsSaved() {
return CGCorpse::GetBaseOffsetSaved() + 3;
}
CGCorpseData* CGCorpse::Corpse() const {
return this->m_corpse;
}

View File

@ -17,9 +17,13 @@ class CGCorpse {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGCorpseData* m_corpse;
uint32_t* m_corpseSaved;
// Protected member functions
CGCorpseData* Corpse() const;
};
#endif

View File

@ -24,3 +24,7 @@ uint32_t CGDynamicObject::TotalFields() {
uint32_t CGDynamicObject::TotalFieldsSaved() {
return CGDynamicObject::GetBaseOffsetSaved() + 0;
}
CGDynamicObjectData* CGDynamicObject::DynamicObject() const {
return this->m_dynamicObj;
}

View File

@ -17,9 +17,13 @@ class CGDynamicObject {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGDynamicObjectData* m_dynamicObj;
uint32_t* m_dynamicObjSaved;
// Protected member functions
CGDynamicObjectData* DynamicObject() const;
};
#endif

View File

@ -24,3 +24,7 @@ uint32_t CGGameObject::TotalFields() {
uint32_t CGGameObject::TotalFieldsSaved() {
return CGGameObject::GetBaseOffsetSaved() + 4;
}
CGGameObjectData* CGGameObject::GameObject() const {
return this->m_gameObj;
}

View File

@ -17,9 +17,13 @@ class CGGameObject {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGGameObjectData* m_gameObj;
uint32_t* m_gameObjSaved;
// Protected member functions
CGGameObjectData* GameObject() const;
};
#endif

View File

@ -24,3 +24,7 @@ uint32_t CGItem::TotalFields() {
uint32_t CGItem::TotalFieldsSaved() {
return CGItem::GetBaseOffsetSaved() + 47;
}
CGItemData* CGItem::Item() const {
return this->m_item;
}

View File

@ -38,9 +38,13 @@ class CGItem {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGItemData* m_item;
uint32_t* m_itemSaved;
// Protected member functions
CGItemData* Item() const;
};
#endif

View File

@ -23,3 +23,19 @@ uint32_t CGObject::TotalFields() {
uint32_t CGObject::TotalFieldsSaved() {
return CGObject::GetBaseOffsetSaved() + 3;
}
WOWGUID CGObject::GetGUID() const {
return this->m_obj->m_guid;
}
OBJECT_TYPE CGObject::GetType() const {
return this->m_obj->m_type;
}
OBJECT_TYPE_ID CGObject::GetTypeID() const {
return this->m_typeID;
}
CGObjectData* CGObject::Obj() const {
return this->m_obj;
}

View File

@ -25,10 +25,21 @@ class CGObject {
// Public member variables
uint32_t uint0; // TODO what is this?
uint32_t m_memHandle;
// Public member functions
WOWGUID GetGUID() const;
OBJECT_TYPE GetType() const;
OBJECT_TYPE_ID GetTypeID() const;
protected:
// Protected member variables
CGObjectData* m_obj;
uint32_t* m_objSaved;
uint32_t m_memHandle;
OBJECT_TYPE_ID m_typeID;
// Protected member functions
CGObjectData* Obj() const;
};
#endif

View File

@ -5,6 +5,10 @@
CGObject_C::CGObject_C(uint32_t time, CClientObjCreate& objCreate) {
// TODO
this->m_model = nullptr;
// TODO
this->m_lockCount = 0;
this->m_disabled = false;
this->m_inReenable = false;
@ -27,6 +31,14 @@ void CGObject_C::AddWorldObject() {
// TODO
}
int32_t CGObject_C::CanBeTargetted() {
return false;
}
int32_t CGObject_C::CanHighlight() {
return false;
}
void CGObject_C::Disable() {
// TODO

View File

@ -8,12 +8,16 @@
#include <storm/Hash.hpp>
#include <storm/List.hpp>
class CM2Model;
class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID> {
public:
// Public member variables
TSLink<CGObject_C> m_link;
uint32_t m_disableTimeMs;
// TODO
CM2Model* m_model;
// TODO
uint32_t m_lockCount : 16;
uint32_t m_disabled : 1;
uint32_t m_inReenable : 1;
@ -29,6 +33,8 @@ class CGObject_C : public CGObject, public TSHashObject<CGObject_C, CHashKeyGUID
void PostReenable();
virtual void HandleOutOfRange(OUT_OF_RANGE_TYPE type) {};
// TODO
virtual int32_t CanHighlight();
virtual int32_t CanBeTargetted();
// Public member functions
CGObject_C() = default;

View File

@ -40,3 +40,7 @@ uint32_t CGPlayer::TotalFieldsSaved() {
uint32_t CGPlayer::TotalRemoteFieldsSaved() {
return CGPlayer::GetBaseOffsetSaved() + 173;
}
CGPlayerData* CGPlayer::Player() const {
return this->m_player;
}

View File

@ -148,9 +148,13 @@ class CGPlayer {
static uint32_t TotalFieldsSaved();
static uint32_t TotalRemoteFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGPlayerData* m_player;
uint32_t* m_playerSaved;
// Protected member functions
CGPlayerData* Player() const;
};
#endif

View File

@ -24,3 +24,7 @@ uint32_t CGUnit::TotalFields() {
uint32_t CGUnit::TotalFieldsSaved() {
return CGUnit::GetBaseOffsetSaved() + 123;
}
CGUnitData* CGUnit::Unit() const {
return this->m_unit;
}

View File

@ -82,9 +82,13 @@ class CGUnit {
static uint32_t TotalFields();
static uint32_t TotalFieldsSaved();
// Public member variables
protected:
// Protected member variables
CGUnitData* m_unit;
uint32_t* m_unitSaved;
// Protected member functions
CGUnitData* Unit() const;
};
#endif

View File

@ -1,5 +1,7 @@
#include "object/client/CGUnit_C.hpp"
#include "object/client/ObjMgr.hpp"
#include "db/Db.hpp"
#include "ui/Game.hpp"
WOWGUID CGUnit_C::s_activeMover;
@ -99,6 +101,20 @@ CGUnit_C::~CGUnit_C() {
// TODO
}
int32_t CGUnit_C::CanHighlight() {
if (this->m_unit->flags & 0x2000000) {
if (this->m_unit->createdBy != ClntObjMgrGetActivePlayer() || this->GetGUID() != CGPetInfo::GetPet(0)) {
return false;
}
}
return true;
}
int32_t CGUnit_C::CanBeTargetted() {
return this->CanHighlight();
}
void CGUnit_C::PostInit(uint32_t time, const CClientObjCreate& init, bool a4) {
// TODO

View File

@ -21,6 +21,10 @@ class CGUnit_C : public CGObject_C, public CGUnit {
// Virtual public member functions
virtual ~CGUnit_C();
// TODO
virtual int32_t CanHighlight();
virtual int32_t CanBeTargetted();
// TODO
// Public member functions
CGUnit_C(uint32_t time, CClientObjCreate& objCreate);

View File

@ -61,7 +61,7 @@ int32_t PostInitObject(CDataStore* msg, uint32_t time, bool a3) {
return 0;
}
if (object->m_inReenable && object->m_obj->m_type & TYPE_UNIT) {
if (object->m_inReenable && object->GetType() & TYPE_UNIT) {
// TODO
}
@ -139,7 +139,7 @@ void PostMovementUpdate(CDataStore* msg) {
return;
}
unit->PostMovementUpdate(move, unit->m_obj->m_guid == CGUnit_C::s_activeMover);
unit->PostMovementUpdate(move, unit->GetGUID() == CGUnit_C::s_activeMover);
if (reenable) {
unit->Reenable();
@ -201,7 +201,7 @@ int32_t UpdateObject(CDataStore* msg) {
auto object = GetUpdateObject(guid, &reenable);
if (object) {
if (!FillInPartialObjectData(object, object->m_obj->m_guid, msg, false, false)) {
if (!FillInPartialObjectData(object, object->GetGUID(), msg, false, false)) {
return 0;
}
@ -329,7 +329,7 @@ int32_t CreateObject(CDataStore* msg, uint32_t time) {
if (existingObject) {
CClientObjCreate::Skip(msg);
if (!FillInPartialObjectData(existingObject, existingObject->m_obj->m_guid, msg, false, true)) {
if (!FillInPartialObjectData(existingObject, existingObject->GetGUID(), msg, false, true)) {
return 0;
}

View File

@ -91,7 +91,7 @@ uint32_t GetNumDwordBlocks(OBJECT_TYPE type, WOWGUID guid) {
* to indicate the end of the hierarchy.
*/
OBJECT_TYPE_ID IncTypeID(CGObject_C* object, OBJECT_TYPE_ID curTypeID) {
switch (object->m_obj->m_type) {
switch (object->GetType()) {
// ID_OBJECT -> ID_ITEM -> ID_CONTAINER
case HIER_TYPE_ITEM:
case HIER_TYPE_CONTAINER:
@ -173,7 +173,7 @@ int32_t CallMirrorHandlers(CDataStore* msg, bool a2, WOWGUID guid) {
OBJECT_TYPE_ID typeID = ID_OBJECT;
uint32_t blockOffset = 0;
uint32_t numBlocks = GetNumDwordBlocks(object->m_obj->m_type, guid);
uint32_t numBlocks = GetNumDwordBlocks(object->GetType(), guid);
for (int32_t block = 0; block < numBlocks; block++) {
if (block >= s_objMirrorBlocks[typeID]) {
@ -203,7 +203,7 @@ int32_t FillInPartialObjectData(CGObject_C* object, WOWGUID guid, CDataStore* ms
OBJECT_TYPE_ID typeID = ID_OBJECT;
uint32_t blockOffset = 0;
uint32_t numBlocks = GetNumDwordBlocks(object->m_obj->m_type, guid);
uint32_t numBlocks = GetNumDwordBlocks(object->GetType(), guid);
for (int32_t block = 0; block < numBlocks; block++) {
if (block >= s_objMirrorBlocks[typeID]) {

View File

@ -93,9 +93,9 @@ CGObject_C* ClntObjMgrAllocObject(OBJECT_TYPE_ID typeID, WOWGUID guid) {
void ClntObjMgrFreeObject(CGObject_C* object) {
auto playerGUID = ClntObjMgrGetActivePlayer();
auto isActivePlayer = object->m_obj->m_guid == playerGUID;
auto isActivePlayer = object->GetGUID() == playerGUID;
switch (object->m_obj->m_type) {
switch (object->GetType()) {
case TYPE_OBJECT:
case HIER_TYPE_ITEM:
case HIER_TYPE_CONTAINER:
@ -117,7 +117,7 @@ void ClntObjMgrFreeObject(CGObject_C* object) {
if (isActivePlayer) {
STORM_FREE(object);
} else {
ObjectFree(s_objHeapId[object->m_typeID], object->m_memHandle);
ObjectFree(s_objHeapId[object->GetTypeID()], object->m_memHandle);
}
}
@ -171,8 +171,8 @@ void ClntObjMgrInitializeStd(uint32_t mapID) {
}
void ClntObjMgrLinkInNewObject(CGObject_C* object) {
CHashKeyGUID key(object->m_obj->m_guid);
s_curMgr->m_objects.Insert(object, object->m_obj->m_guid, key);
CHashKeyGUID key(object->GetGUID());
s_curMgr->m_objects.Insert(object, object->GetGUID(), key);
}
CGObject_C* ClntObjMgrObjectPtr(WOWGUID guid, OBJECT_TYPE type, const char* fileName, int32_t lineNumber) {
@ -186,7 +186,7 @@ CGObject_C* ClntObjMgrObjectPtr(WOWGUID guid, OBJECT_TYPE type, const char* file
return nullptr;
}
if (!(object->m_obj->m_type & type)) {
if (!(object->GetType() & type)) {
return nullptr;
}

View File

@ -107,11 +107,11 @@ void HandleObjectOutOfRangePass2(CGObject_C* object) {
}
ClntObjMgrGetCurrent()->m_lazyCleanupObjects.Insert(object, object->m_hashval, CHashKeyGUID(object->m_key));
ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->m_typeID - 1].LinkToTail(object);
ClntObjMgrGetCurrent()->m_lazyCleanupFifo[object->GetTypeID() - 1].LinkToTail(object);
}
void InitObject(CGObject_C* object, uint32_t time, CClientObjCreate& objCreate) {
switch (object->m_typeID) {
switch (object->GetTypeID()) {
case ID_ITEM: {
new (object) CGItem_C(time, objCreate);

View File

@ -2,5 +2,6 @@
#define UI_GAME_HPP
#include "ui/game/CGGameUI.hpp"
#include "ui/game/CGPetInfo.hpp"
#endif

View File

@ -98,6 +98,21 @@ enum TextureImageMode {
ImageMode_Desaturate = 1
};
enum TOOLTIP_ANCHORPOINT {
TOOLTIP_ANCHOR_LEFT = 0,
TOOLTIP_ANCHOR_RIGHT = 1,
TOOLTIP_ANCHOR_BOTTOMLEFT = 2,
TOOLTIP_ANCHOR_BOTTOM = 3,
TOOLTIP_ANCHOR_BOTTOMRIGHT = 4,
TOOLTIP_ANCHOR_TOPLEFT = 5,
TOOLTIP_ANCHOR_TOP = 6,
TOOLTIP_ANCHOR_TOPRIGHT = 7,
TOOLTIP_ANCHOR_CURSOR = 8,
TOOLTIP_ANCHOR_NONE = 9,
TOOLTIP_ANCHOR_PRESERVE = 10,
TOOLTIP_ANCHOR_CURSOR_RIGHT = 11,
};
struct FRAMEPRIORITY {
CSimpleFrame* frame;
uint32_t priority;

View File

@ -1,4 +1,5 @@
#include "ui/game/BattlefieldInfoScript.hpp"
#include "ui/game/CGBattlefieldInfo.hpp"
#include "ui/FrameScript.hpp"
#include "util/Unimplemented.hpp"
@ -105,7 +106,9 @@ int32_t Script_GetBattlefieldStatData(lua_State* L) {
}
int32_t Script_RequestBattlefieldPositions(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
CGBattlefieldInfo::RequestPlayerPositions();
return 0;
}
int32_t Script_GetNumBattlefieldPositions(lua_State* L) {

View File

@ -0,0 +1,5 @@
#include "ui/game/CGBattlefieldInfo.hpp"
void CGBattlefieldInfo::RequestPlayerPositions() {
// TODO
}

View File

@ -0,0 +1,10 @@
#ifndef UI_GAME_C_G_BATTLEFIELD_INFO_HPP
#define UI_GAME_C_G_BATTLEFIELD_INFO_HPP
class CGBattlefieldInfo {
public:
// Static functions
static void RequestPlayerPositions();
};
#endif

View File

@ -21,7 +21,9 @@
#include "util/CStatus.hpp"
#include <common/MD5.hpp>
WOWGUID CGGameUI::s_currentObjectTrack;
CScriptObject* CGGameUI::s_gameTooltip;
WOWGUID CGGameUI::s_lockedTarget;
CSimpleTop* CGGameUI::s_simpleTop;
void LoadScriptFunctions() {
@ -57,6 +59,14 @@ void LoadScriptFunctions() {
// TODO
}
WOWGUID& CGGameUI::GetCurrentObjectTrack() {
return CGGameUI::s_currentObjectTrack;
}
WOWGUID& CGGameUI::GetLockedTarget() {
return CGGameUI::s_lockedTarget;
}
void CGGameUI::Initialize() {
// TODO
@ -131,7 +141,7 @@ void CGGameUI::Initialize() {
// TODO
CGGameUI::s_gameTooltip = CScriptObject::GetScriptObjectByName("GameTooltip", CGTooltip::GetObjectType());
// TODO STORM_ASSERT(CGGameUI::s_gameTooltip);
STORM_ASSERT(CGGameUI::s_gameTooltip);
// TODO
}
@ -144,6 +154,18 @@ void CGGameUI::InitializeGame() {
// TODO
}
int32_t CGGameUI::IsRaidMember(const WOWGUID& guid) {
// TODO
return false;
}
int32_t CGGameUI::IsRaidMemberOrPet(const WOWGUID& guid) {
// TODO
return false;
}
void CGGameUI::RegisterFrameFactories() {
FrameXML_RegisterFactory("WorldFrame", &CGWorldFrame::Create, true);
FrameXML_RegisterFactory("GameTooltip", &CGTooltip::Create, false);

View File

@ -1,6 +1,8 @@
#ifndef UI_GAME_C_G_GAME_UI_HPP
#define UI_GAME_C_G_GAME_UI_HPP
#include "util/guid/Types.hpp"
class CScriptObject;
class CSimpleTop;
@ -11,9 +13,17 @@ class CGGameUI {
static CSimpleTop* s_simpleTop;
// Static functions
static WOWGUID& GetCurrentObjectTrack();
static WOWGUID& GetLockedTarget();
static void Initialize();
static void InitializeGame();
static int32_t IsRaidMember(const WOWGUID& guid);
static int32_t IsRaidMemberOrPet(const WOWGUID& guid);
static void RegisterFrameFactories();
private:
static WOWGUID s_currentObjectTrack;
static WOWGUID s_lockedTarget;
};
#endif

View File

@ -0,0 +1,6 @@
#include "ui/game/CGPetInfo.hpp"
WOWGUID CGPetInfo::GetPet(uint32_t index) {
// TODO
return 0;
}

13
src/ui/game/CGPetInfo.hpp Normal file
View File

@ -0,0 +1,13 @@
#ifndef UI_GAME_C_G_PET_INFO_HPP
#define UI_GAME_C_G_PET_INFO_HPP
#include "util/GUID.hpp"
#include <cstdint>
class CGPetInfo {
public:
// Static functions
static WOWGUID GetPet(uint32_t index);
};
#endif

View File

@ -35,3 +35,10 @@ CGTooltip::CGTooltip(CSimpleFrame* parent) : CSimpleFrame(parent) {
int32_t CGTooltip::GetScriptMetaTable() {
return CGTooltip::s_metatable;
}
bool CGTooltip::IsA(int32_t type) {
return type == CGTooltip::s_objectType
|| type == CSimpleFrame::s_objectType
|| type == CScriptRegion::s_objectType
|| type == CScriptObject::s_objectType;
}

View File

@ -16,9 +16,14 @@ class CGTooltip : public CSimpleFrame {
static void RegisterScriptMethods(lua_State* L);
// Member variables
CSimpleFrame* m_owner = nullptr;
TOOLTIP_ANCHORPOINT m_anchorPoint;
// TODO
C2Vector m_offset;
// TODO
// Virtual member functions
virtual bool IsA(int32_t type);
virtual int32_t GetScriptMetaTable();
// Member functions

View File

@ -1,5 +1,7 @@
#include "ui/game/CGTooltipScript.hpp"
#include "ui/game/CGTooltip.hpp"
#include "ui/FrameScript.hpp"
#include "util/Lua.hpp"
#include "util/Unimplemented.hpp"
namespace {
@ -25,7 +27,35 @@ int32_t CGTooltip_GetPadding(lua_State* L) {
}
int32_t CGTooltip_IsOwned(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
auto type = CGTooltip::GetObjectType();
auto tooltip = static_cast<CGTooltip*>(FrameScript_GetObjectThis(L, type));
if (lua_type(L, 2) != LUA_TTABLE) {
luaL_error(L, "Usage: %s:IsOwned(frame)", tooltip->GetDisplayName());
return 0;
}
lua_rawgeti(L, 2, 0);
auto frame = static_cast<CSimpleFrame*>(lua_touserdata(L, -1));
lua_settop(L, -2);
if (!frame) {
luaL_error(L, "%s:IsOwned(): Couldn't find 'this' in frame object", tooltip->GetDisplayName());
return 0;
}
if (!frame->IsA(CSimpleFrame::GetObjectType())) {
luaL_error(L, "%s:IsOwned(): Wrong object type, expected frame", tooltip->GetDisplayName());
return 0;
}
if (tooltip->m_owner == frame) {
lua_pushnumber(L, 1.0);
} else {
lua_pushnil(L);
}
return 1;
}
int32_t CGTooltip_GetOwner(lua_State* L) {

View File

@ -1,12 +1,29 @@
#include "ui/game/ScriptEvents.hpp"
#include "object/client/ObjMgr.hpp"
#include "ui/FrameScript.hpp"
#include "ui/ScriptFunctionsSystem.hpp"
#include "ui/game/CGGameUI.hpp"
#include "ui/game/ScriptUtil.hpp"
#include "util/GUID.hpp"
#include "util/Lua.hpp"
#include "util/Unimplemented.hpp"
namespace {
int32_t Script_UnitExists(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
auto token = lua_tostring(L, 1);
WOWGUID guid = 0;
Script_GetGUIDFromToken(token, guid, false);
auto object = ClntObjMgrObjectPtr(guid, TYPE_OBJECT, __FILE__, __LINE__);
if ((object && object->CanBeTargetted()) || CGGameUI::IsRaidMemberOrPet(guid)) {
lua_pushnumber(L, 1.0);
} else {
lua_pushnil(L);
}
return 1;
}
int32_t Script_UnitIsVisible(lua_State* L) {
@ -18,7 +35,19 @@ int32_t Script_UnitIsUnit(lua_State* L) {
}
int32_t Script_UnitIsPlayer(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
auto token = lua_tostring(L, 1);
WOWGUID guid = 0;
Script_GetGUIDFromToken(token, guid, false);
auto object = ClntObjMgrObjectPtr(guid, TYPE_PLAYER, __FILE__, __LINE__);
if (object || CGGameUI::IsRaidMember(guid)) {
lua_pushnumber(L, 1.0);
} else {
lua_pushnil(L);
}
return 1;
}
int32_t Script_UnitIsInMyGuild(lua_State* L) {

191
src/ui/game/ScriptUtil.cpp Normal file
View File

@ -0,0 +1,191 @@
#include "ui/game/ScriptUtil.hpp"
#include "object/Client.hpp"
#include "ui/game/CGGameUI.hpp"
#include <storm/String.hpp>
namespace {
bool ParseTrailingTokens(const char* token, WOWGUID& guid, CGPlayer_C* player) {
// TODO
return true;
}
}
bool Script_GetGUIDFromString(const char*& token, WOWGUID& guid) {
// TODO
return true;
}
bool Script_GetGUIDFromToken(const char* token, WOWGUID& guid, bool defaultToTarget) {
auto activePlayer = static_cast<CGPlayer_C*>(ClntObjMgrObjectPtr(ClntObjMgrGetActivePlayer(), TYPE_PLAYER, __FILE__, __LINE__));
// Null or empty token
if (token == nullptr || *token == '\0') {
if (defaultToTarget) {
guid = CGGameUI::GetLockedTarget();
return true;
}
return false;
}
guid = 0;
auto parseToken = token;
// player - active player
if (!SStrCmpI(parseToken, "player", 6)) {
parseToken += 6;
if (activePlayer) {
guid = activePlayer->GetGUID();
}
}
// vehicle - active player's vehicle
else if (!SStrCmpI(parseToken, "vehicle", 7)) {
parseToken += 7;
// TODO
}
// pet - active player's pet
else if (!SStrCmpI(parseToken, "pet", 3)) {
parseToken += 3;
// TODO
}
// target - current locked target
else if (!SStrCmpI(parseToken, "target", 6)) {
parseToken += 6;
guid = CGGameUI::GetLockedTarget();
}
// partypet1-4 - party member's pet
else if (!SStrCmpI(parseToken, "partypet", 8)) {
parseToken += 8;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// party1-4 - party member
else if (!SStrCmpI(parseToken, "party", 5)) {
parseToken += 5;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// raidpet1-40 - raid member's pet
else if (!SStrCmpI(parseToken, "raidpet", 7)) {
parseToken += 7;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// raid1-40 - raid member
else if (!SStrCmpI(parseToken, "raid", 4)) {
parseToken += 4;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// boss1-5 - boss unit
else if (!SStrCmpI(parseToken, "boss", 4)) {
parseToken += 4;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// arenapet1-5 - arena opponent's pet
else if (!SStrCmpI(parseToken, "arenapet", 8)) {
parseToken += 8;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// arena1-5 - arena opponent
else if (!SStrCmpI(parseToken, "arena", 5)) {
parseToken += 5;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// commentator1-N - commentator arena member
else if (!SStrCmpI(parseToken, "commentator", 11)) {
parseToken += 11;
auto index = SStrToUnsigned(parseToken);
// TODO
}
// mouseover - object under cursor
else if (!SStrCmpI(parseToken, "mouseover", 9)) {
parseToken += 9;
auto trackedObjectGuid = CGGameUI::GetCurrentObjectTrack();
if (ClntObjMgrObjectPtr(trackedObjectGuid, TYPE_UNIT, __FILE__, __LINE__) || CGGameUI::IsRaidMemberOrPet(trackedObjectGuid)) {
guid = trackedObjectGuid;
}
}
// focus - focus target
else if (!SStrCmpI(parseToken, "focus", 5)) {
parseToken += 5;
// TODO
}
// npc - NPC interaction target
else if (!SStrCmpI(parseToken, "npc")) {
parseToken += 3;
// TODO
}
// questnpc - quest giver NPC
else if (!SStrCmpI(parseToken, "questnpc")) {
parseToken += 8;
// TODO
}
// none
else if (!SStrCmpI(parseToken, "none")) {
parseToken += 4;
guid = -1;
}
// Token string was fully parsed or GUID was determined and token string potentially includes
// trailing tokens
if ((*parseToken == '\0' || guid) && ParseTrailingTokens(parseToken, guid, activePlayer)) {
if (!guid) {
guid = -2;
}
return true;
}
// Token string was either not parsed or only partially parsed and GUID was not determined
if (!guid && Script_GetGUIDFromString(token, guid) && ParseTrailingTokens(token, guid, activePlayer)) {
if (!guid) {
guid = -2;
}
return true;
}
// GUID was not successfully determined
return false;
}

View File

@ -0,0 +1,10 @@
#ifndef UI_GAME_SCRIPT_UTIL_HPP
#define UI_GAME_SCRIPT_UTIL_HPP
#include "util/GUID.hpp"
bool Script_GetGUIDFromString(const char*& token, WOWGUID& guid);
bool Script_GetGUIDFromToken(const char* token, WOWGUID& guid, bool defaultToTarget);
#endif

View File

@ -218,7 +218,22 @@ int32_t CSimpleButton_SetFontString(lua_State* L) {
}
int32_t CSimpleButton_GetFontString(lua_State* L) {
WHOA_UNIMPLEMENTED(0);
auto type = CSimpleButton::GetObjectType();
auto button = static_cast<CSimpleButton*>(FrameScript_GetObjectThis(L, type));
auto text = button->m_text;
if (!text) {
lua_pushnil(L);
return 1;
}
if (!text->lua_registered) {
text->RegisterScriptObject(nullptr);
}
lua_rawgeti(L, LUA_REGISTRYINDEX, text->lua_objectRef);
return 1;
}
int32_t CSimpleButton_SetText(lua_State* L) {