Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/GameObjects: fixed build in gcc

Browse Source 
(cherry picked from commit c5bbc9287d)
This commit is contained in:
Rat
2015-04-06 13:11:35 +02:00
committed by DDuarte
parent 916ce6f4f3
commit 6dcfe9ba17
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -276,8 +276,8 @@ bool GameObject::Create(uint32 guidlow, uint32 name_id, Map* map, uint32 phaseMa
{
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);
}
}

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

@@ -579,7 +579,7 @@ struct GameObjectLocale
// `gameobject_addon` table
struct GameObjectAddon
{
InvisibilityType InvisibilityType;
InvisibilityType invisibilityType;
uint32 InvisibilityValue;
};

8
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -1067,17 +1067,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;