Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/GameObjects: fixed build in gcc

Browse Source 
(cherry picked from commit c5bbc9287d1e8ae9335598780ebd7db47b522fb2)
This commit is contained in:
Rat authored and DDuarte committed 2015-05-19 13:58:40 +01:00
1 parent 916ce6f4f3
commit 6dcfe9ba17
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/GameObject/GameObject.cpp
+2 -2
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);
}
}
src/server/game/Entities/GameObject/GameObject.h
+1 -1
View File
@@ -579,7 +579,7 @@ struct GameObjectLocale
// `gameobject_addon` table
struct GameObjectAddon
{
InvisibilityType InvisibilityType;
InvisibilityType invisibilityType;
uint32 InvisibilityValue;
};
src/server/game/Globals/ObjectMgr.cpp
+4 -4
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;