Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/GameObjects: Changed gameobject artkit type to uint32

Browse Source
This commit is contained in:
Shauren
2022-05-22 20:13:56 +02:00
parent d76e2805bd
commit bb3b2cf4cb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/GameObject/GameObject.cpp
View File

@@ -1778,7 +1778,7 @@ void GameObject::ActivateObject(GameObjectActions action, int32 param, WorldObje
}
}
void GameObject::SetGoArtKit(uint8 kit)
void GameObject::SetGoArtKit(uint32 kit)
{
SetUpdateFieldValue(m_values.ModifyValue(&GameObject::m_gameObjectData).ModifyValue(&UF::GameObjectData::ArtKit), kit);
GameObjectData* data = const_cast<GameObjectData*>(sObjectMgr->GetGameObjectData(m_spawnId));
@@ -1786,7 +1786,7 @@ void GameObject::SetGoArtKit(uint8 kit)
data->artKit = kit;
}
void GameObject::SetGoArtKit(uint8 artkit, GameObject* go, ObjectGuid::LowType lowguid)
void GameObject::SetGoArtKit(uint32 artkit, GameObject* go, ObjectGuid::LowType lowguid)
{
GameObjectData const* data = nullptr;
if (go)

6
src/server/game/Entities/GameObject/GameObject.h
View File

@@ -211,11 +211,11 @@ class TC_GAME_API GameObject : public WorldObject, public GridObject<GameObject>
void SetGoState(GOState state);
virtual uint32 GetTransportPeriod() const;
void SetTransportState(GOState state, uint32 stopFrame = 0);
uint8 GetGoArtKit() const { return m_gameObjectData->ArtKit; }
void SetGoArtKit(uint8 artkit);
uint32 GetGoArtKit() const { return m_gameObjectData->ArtKit; }
void SetGoArtKit(uint32 artkit);
uint8 GetGoAnimProgress() const { return m_gameObjectData->PercentHealth; }
void SetGoAnimProgress(uint8 animprogress) { SetUpdateFieldValue(m_values.ModifyValue(&GameObject::m_gameObjectData).ModifyValue(&UF::GameObjectData::PercentHealth), animprogress); }
static void SetGoArtKit(uint8 artkit, GameObject* go, ObjectGuid::LowType lowguid = UI64LIT(0));
static void SetGoArtKit(uint32 artkit, GameObject* go, ObjectGuid::LowType lowguid = UI64LIT(0));
void EnableCollision(bool enable);

2
src/server/game/Entities/GameObject/GameObjectData.h
View File

@@ -1115,7 +1115,7 @@ struct GameObjectData : public SpawnData
QuaternionData rotation;
uint32 animprogress = 0;
GOState goState = GO_STATE_ACTIVE;
uint8 artKit = 0;
uint32 artKit = 0;
};
enum class GameObjectActions : uint32