diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 28b511892..1e441cf3b 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -1088,7 +1088,7 @@ bool ChatHandler::HandleGameObjectAddCommand(char* args) GameObject* pGameObj = new GameObject; // used guids from specially reserved range (can be 0 if no free values) - uint32 db_lowGUID = sObjectMgr.GenerateStaticGameobjectLowGuid(); + uint32 db_lowGUID = sObjectMgr.GenerateStaticGameObjectLowGuid(); if (!db_lowGUID) { SendSysMessage(LANG_NO_FREE_STATIC_GUID_FOR_SPAWN); diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 92049d4e4..2b3d472a5 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -5692,7 +5692,7 @@ void ObjectMgr::SetHighestGuids() m_StaticCreatureGuids.Set(m_FirstTemporaryCreatureGuid); m_FirstTemporaryCreatureGuid += sWorld.getConfig(CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE); - m_StaticGamebjectGuids.Set(m_FirstTemporaryGameObjectGuid); + m_StaticGameObjectGuids.Set(m_FirstTemporaryGameObjectGuid); m_FirstTemporaryGameObjectGuid += sWorld.getConfig(CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT); } diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h index b4e8f4d9a..2e0fab8e0 100644 --- a/src/game/ObjectMgr.h +++ b/src/game/ObjectMgr.h @@ -724,7 +724,7 @@ class ObjectMgr // used in .npc add/.gobject add commands for adding static spawns uint32 GenerateStaticCreatureLowGuid() { if (m_StaticCreatureGuids.GetNextAfterMaxUsed() >= m_FirstTemporaryCreatureGuid) return 0; return m_StaticCreatureGuids.Generate(); } - uint32 GenerateStaticGameobjectLowGuid() { if (m_StaticGamebjectGuids.GetNextAfterMaxUsed() >= m_FirstTemporaryGameObjectGuid) return 0; return m_StaticGamebjectGuids.Generate(); } + uint32 GenerateStaticGameObjectLowGuid() { if (m_StaticGameObjectGuids.GetNextAfterMaxUsed() >= m_FirstTemporaryGameObjectGuid) return 0; return m_StaticGameObjectGuids.Generate(); } uint32 GeneratePlayerLowGuid() { return m_CharGuids.Generate(); } uint32 GenerateItemLowGuid() { return m_ItemGuids.Generate(); } @@ -1054,7 +1054,7 @@ class ObjectMgr // guids from reserved range for use in .npc add/.gobject add commands for adding new static spawns (saved in DB) from client. ObjectGuidGenerator m_StaticCreatureGuids; - ObjectGuidGenerator m_StaticGamebjectGuids; + ObjectGuidGenerator m_StaticGameObjectGuids; // first free low guid for selected guid type ObjectGuidGenerator m_CharGuids; diff --git a/src/game/World.cpp b/src/game/World.cpp index d3d9e516f..04e0820a6 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -839,8 +839,8 @@ void World::LoadConfigSettings(bool reload) if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE, "GuidReserveSize.Creature", 100)) setConfigPos(CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE, "GuidReserveSize.Creature", 100); - if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT, "GuidReserveSize.Gameobject", 100)) - setConfigPos(CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT, "GuidReserveSize.Gameobject", 100); + if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT, "GuidReserveSize.GameObject", 100)) + setConfigPos(CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT, "GuidReserveSize.GameObject", 100); ///- Read the "Data" directory from the config file std::string dataPath = sConfig.GetStringDefault("DataDir", "./"); diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in index d8bc43aaa..9c9af3030 100644 --- a/src/mangosd/mangosd.conf.dist.in +++ b/src/mangosd/mangosd.conf.dist.in @@ -936,7 +936,7 @@ TalentsInspecting = 1 # Default: 300 # # GuidReserveSize.Creature -# GuidReserveSize.Gameobject +# GuidReserveSize.GameObject # Amount guids reserved for .npc add/.gobject add directly after last used in DB static spawned creature/gameobject guid # Commands .npc add/.gobject add can be used only for guids from this reserve and required server restart if all guids # from reserve used before above commands can be used in like case. Less size increase amount guids for dynamic spawns @@ -978,7 +978,7 @@ ListenRange.Say = 40 ListenRange.TextEmote = 40 ListenRange.Yell = 300 GuidReserveSize.Creature = 100 -GuidReserveSize.Gameobject = 100 +GuidReserveSize.GameObject = 100 ################################################################################################################### diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 18622a0e1..f339b1e5f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11314" + #define REVISION_NR "11315" #endif // __REVISION_NR_H__