aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-03-02 02:23:18 +0100
committerariel- <ariel-@users.noreply.github.com>2017-03-01 22:23:18 -0300
commit3fe03392d792b4f7ddcc2326f215d9f459bef991 (patch)
tree935bbe56f0717b5bac3c8f27ab604567f1ff7d4a /src
parentaffee140c6a8e1e9358be2aa0d0088ede218acaa (diff)
Make ObjectMgrs _mailId and _hiPetNumber atomic (#19129)
- They can be accessed from multiple threads simultaneously
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp1
-rw-r--r--src/server/game/Globals/ObjectMgr.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index aba664546d6..e3828d7930b 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -223,7 +223,6 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke
ObjectMgr::ObjectMgr():
_auctionId(1),
_equipmentSetGuid(1),
- _itemTextId(1),
_mailId(1),
_hiPetNumber(1),
_creatureSpawnId(1),
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 6638f0e6d15..47675c83e0c 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1341,9 +1341,8 @@ class TC_GAME_API ObjectMgr
// first free id for selected id type
uint32 _auctionId;
uint64 _equipmentSetGuid;
- uint32 _itemTextId;
- uint32 _mailId;
- uint32 _hiPetNumber;
+ std::atomic<uint32> _mailId;
+ std::atomic<uint32> _hiPetNumber;
uint32 _creatureSpawnId;
uint32 _gameObjectSpawnId;