Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4
Conflicts: dep/cppformat/CMakeLists.txt dep/cppformat/ChangeLog.rst dep/cppformat/format.cc dep/cppformat/format.h dep/cppformat/posix.cc dep/cppformat/posix.h sql/updates/world/2015_03_16_02_world.sql sql/updates/world/2015_03_16_03_world.sql sql/updates/world/2015_03_16_04_world.sql sql/updates/world/2015_03_16_05_world.sql sql/updates/world/2015_03_16_06_world.sql sql/updates/world/2015_03_17_00_world.sql src/server/game/Conditions/ConditionMgr.cpp src/server/game/Conditions/ConditionMgr.h src/server/worldserver/CMakeLists.txt
This commit is contained in:
commit
b82a072b25
41 files changed
+813
-1193
No files matched your search
@@ -1141,7 +1141,7 @@ class ScriptMgr
|
||||
uint32 _scriptCount;
|
||||
|
||||
//atomic op counter for active scripts amount
|
||||
std::atomic_long _scheduledScripts;
|
||||
std::atomic<uint32> _scheduledScripts;
|
||||
};
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user