diff options
Diffstat (limited to 'src/game/GameObject.h')
| -rw-r--r-- | src/game/GameObject.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/game/GameObject.h b/src/game/GameObject.h index ddc47fdac67..bfd265a9818 100644 --- a/src/game/GameObject.h +++ b/src/game/GameObject.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2005-2008 MaNGOS <http://www.mangosproject.org/> + * Copyright (C) 2008 Trinity <http://www.trinitycore.org/> + * + * Thanks to the original authors: MaNGOS <http://www.mangosproject.org/> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -8,16 +10,16 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef MANGOSSERVER_GAMEOBJECT_H -#define MANGOSSERVER_GAMEOBJECT_H +#ifndef TRINITYCORE_GAMEOBJECT_H +#define TRINITYCORE_GAMEOBJECT_H #include "Common.h" #include "SharedDefines.h" @@ -381,6 +383,7 @@ struct GameObjectData uint32 animprogress; uint32 go_state; uint8 spawnMask; + uint32 ArtKit; }; // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some platform @@ -407,7 +410,7 @@ class Unit; // 5 sec for bobber catch #define FISHING_BOBBER_READY_TIME 5 -class MANGOS_DLL_SPEC GameObject : public WorldObject +class TRINITY_DLL_SPEC GameObject : public WorldObject { public: explicit GameObject(); @@ -416,7 +419,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject void AddToWorld(); void RemoveFromWorld(); - bool Create(uint32 guidlow, uint32 name_id, Map *map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, uint32 go_state); + bool Create(uint32 guidlow, uint32 name_id, Map *map, float x, float y, float z, float ang, float rotation0, float rotation1, float rotation2, float rotation3, uint32 animprogress, uint32 go_state, uint32 ArtKit = 0); void Update(uint32 p_time); static GameObject* GetGameObject(WorldObject& object, uint64 guid); GameObjectInfo const* GetGOInfo() const; @@ -502,7 +505,7 @@ class MANGOS_DLL_SPEC GameObject : public WorldObject uint32 GetGoState() const { return GetUInt32Value(GAMEOBJECT_STATE); } void SetGoState(uint32 state) { SetUInt32Value(GAMEOBJECT_STATE, state); } uint32 GetGoArtKit() const { return GetUInt32Value(GAMEOBJECT_ARTKIT); } - void SetGoArtKit(uint32 artkit) { SetUInt32Value(GAMEOBJECT_ARTKIT, artkit); } + void SetGoArtKit(uint32 artkit); uint32 GetGoAnimProgress() const { return GetUInt32Value(GAMEOBJECT_ANIMPROGRESS); } void SetGoAnimProgress(uint32 animprogress) { SetUInt32Value(GAMEOBJECT_ANIMPROGRESS, animprogress); } |