diff options
author | Rat <gmstreetrat@gmail.com> | 2015-04-06 13:11:35 +0200 |
---|---|---|
committer | Rat <gmstreetrat@gmail.com> | 2015-04-06 13:11:35 +0200 |
commit | c5bbc9287d1e8ae9335598780ebd7db47b522fb2 (patch) | |
tree | f7ffca1b811ba599d6504143c1dea73d189562b7 /src | |
parent | 23e8a3ce2928458649d94408d5deffb67339b1d6 (diff) |
Core/GameObjects: fixed build in gcc
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 4 | ||||
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 2 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 232ee898739..e0c9968e588 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -301,8 +301,8 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u { if (addon->InvisibilityValue) { - m_invisibility.AddFlag(addon->InvisibilityType); - m_invisibility.AddValue(addon->InvisibilityType, addon->InvisibilityValue); + m_invisibility.AddFlag(addon->invisibilityType); + m_invisibility.AddValue(addon->invisibilityType, addon->InvisibilityValue); } } diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 3d57c9823c9..b4492cd77c7 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -801,7 +801,7 @@ struct GameObjectLocale // `gameobject_addon` table struct GameObjectAddon { - InvisibilityType InvisibilityType; + InvisibilityType invisibilityType; uint32 InvisibilityValue; }; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1b36a085cd4..51063666470 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1110,17 +1110,17 @@ void ObjectMgr::LoadGameObjectAddons() } GameObjectAddon& gameObjectAddon = _gameObjectAddonStore[guid]; - gameObjectAddon.InvisibilityType = InvisibilityType(fields[1].GetUInt8()); + gameObjectAddon.invisibilityType = InvisibilityType(fields[1].GetUInt8()); gameObjectAddon.InvisibilityValue = fields[2].GetUInt32(); - if (gameObjectAddon.InvisibilityType >= TOTAL_INVISIBILITY_TYPES) + if (gameObjectAddon.invisibilityType >= TOTAL_INVISIBILITY_TYPES) { TC_LOG_ERROR("sql.sql", "GameObject (GUID: " UI64FMTD ") has invalid InvisibilityType in `gameobject_addon`", guid); - gameObjectAddon.InvisibilityType = INVISIBILITY_GENERAL; + gameObjectAddon.invisibilityType = INVISIBILITY_GENERAL; gameObjectAddon.InvisibilityValue = 0; } - if (gameObjectAddon.InvisibilityType && !gameObjectAddon.InvisibilityValue) + if (gameObjectAddon.invisibilityType && !gameObjectAddon.InvisibilityValue) { TC_LOG_ERROR("sql.sql", "GameObject (GUID: " UI64FMTD ") has InvisibilityType set but has no InvisibilityValue in `gameobject_addon`, set to 1", guid); gameObjectAddon.InvisibilityValue = 1; |