mirror of
https://github.com/liyunfan1223/azerothcore-wotlk.git
synced 2026-08-08 07:48:02 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -563,7 +563,7 @@ public: /* GlobalScript */
|
||||
public: /* Scheduled scripts */
|
||||
uint32 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; }
|
||||
uint32 DecreaseScheduledScriptCount() { return --_scheduledScripts; }
|
||||
uint32 DecreaseScheduledScriptCount(size_t count) { return _scheduledScripts -= count; }
|
||||
uint32 DecreaseScheduledScriptCount(std::size_t count) { return _scheduledScripts -= count; }
|
||||
bool IsScriptScheduled() const { return _scheduledScripts > 0; }
|
||||
|
||||
public: /* UnitScript */
|
||||
@@ -850,7 +850,7 @@ public:
|
||||
if (oldScript)
|
||||
{
|
||||
for (auto& vIt : EnabledHooks)
|
||||
for (size_t i = 0; i < vIt.size(); ++i)
|
||||
for (std::size_t i = 0; i < vIt.size(); ++i)
|
||||
if (vIt[i] == oldScript)
|
||||
{
|
||||
vIt.erase(vIt.begin() + i);
|
||||
|
||||
Reference in New Issue
Block a user