mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
[11315] Fix typos in recent commit
This commit is contained in:
parent
27445940f8
commit
0ceb42ff9a
6 changed files with 9 additions and 9 deletions
|
|
@ -1088,7 +1088,7 @@ bool ChatHandler::HandleGameObjectAddCommand(char* args)
|
||||||
GameObject* pGameObj = new GameObject;
|
GameObject* pGameObj = new GameObject;
|
||||||
|
|
||||||
// used guids from specially reserved range (can be 0 if no free values)
|
// 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)
|
if (!db_lowGUID)
|
||||||
{
|
{
|
||||||
SendSysMessage(LANG_NO_FREE_STATIC_GUID_FOR_SPAWN);
|
SendSysMessage(LANG_NO_FREE_STATIC_GUID_FOR_SPAWN);
|
||||||
|
|
|
||||||
|
|
@ -5692,7 +5692,7 @@ void ObjectMgr::SetHighestGuids()
|
||||||
m_StaticCreatureGuids.Set(m_FirstTemporaryCreatureGuid);
|
m_StaticCreatureGuids.Set(m_FirstTemporaryCreatureGuid);
|
||||||
m_FirstTemporaryCreatureGuid += sWorld.getConfig(CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE);
|
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);
|
m_FirstTemporaryGameObjectGuid += sWorld.getConfig(CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -724,7 +724,7 @@ class ObjectMgr
|
||||||
|
|
||||||
// used in .npc add/.gobject add commands for adding static spawns
|
// 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 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 GeneratePlayerLowGuid() { return m_CharGuids.Generate(); }
|
||||||
uint32 GenerateItemLowGuid() { return m_ItemGuids.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.
|
// guids from reserved range for use in .npc add/.gobject add commands for adding new static spawns (saved in DB) from client.
|
||||||
ObjectGuidGenerator<HIGHGUID_UNIT> m_StaticCreatureGuids;
|
ObjectGuidGenerator<HIGHGUID_UNIT> m_StaticCreatureGuids;
|
||||||
ObjectGuidGenerator<HIGHGUID_GAMEOBJECT> m_StaticGamebjectGuids;
|
ObjectGuidGenerator<HIGHGUID_GAMEOBJECT> m_StaticGameObjectGuids;
|
||||||
|
|
||||||
// first free low guid for selected guid type
|
// first free low guid for selected guid type
|
||||||
ObjectGuidGenerator<HIGHGUID_PLAYER> m_CharGuids;
|
ObjectGuidGenerator<HIGHGUID_PLAYER> m_CharGuids;
|
||||||
|
|
|
||||||
|
|
@ -839,8 +839,8 @@ void World::LoadConfigSettings(bool reload)
|
||||||
|
|
||||||
if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE, "GuidReserveSize.Creature", 100))
|
if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_CREATURE, "GuidReserveSize.Creature", 100))
|
||||||
setConfigPos(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))
|
if (configNoReload(reload, CONFIG_UINT32_GUID_RESERVE_SIZE_GAMEOBJECT, "GuidReserveSize.GameObject", 100))
|
||||||
setConfigPos(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
|
///- Read the "Data" directory from the config file
|
||||||
std::string dataPath = sConfig.GetStringDefault("DataDir", "./");
|
std::string dataPath = sConfig.GetStringDefault("DataDir", "./");
|
||||||
|
|
|
||||||
|
|
@ -936,7 +936,7 @@ TalentsInspecting = 1
|
||||||
# Default: 300
|
# Default: 300
|
||||||
#
|
#
|
||||||
# GuidReserveSize.Creature
|
# 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
|
# 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
|
# 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
|
# 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.TextEmote = 40
|
||||||
ListenRange.Yell = 300
|
ListenRange.Yell = 300
|
||||||
GuidReserveSize.Creature = 100
|
GuidReserveSize.Creature = 100
|
||||||
GuidReserveSize.Gameobject = 100
|
GuidReserveSize.GameObject = 100
|
||||||
|
|
||||||
|
|
||||||
###################################################################################################################
|
###################################################################################################################
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11314"
|
#define REVISION_NR "11315"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue