diff options
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 6 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObjectData.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 01212a02097..16fd48efa0f 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -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) diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 77c5385ccaa..e47df17d3e0 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -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); diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h index d4977063b98..9e7650115e4 100644 --- a/src/server/game/Entities/GameObject/GameObjectData.h +++ b/src/server/game/Entities/GameObject/GameObjectData.h @@ -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 |