diff options
| author | Naios <naios-dev@live.de> | 2016-04-02 22:37:51 +0200 |
|---|---|---|
| committer | Naios <naios-dev@live.de> | 2016-04-11 20:07:24 +0200 |
| commit | 59e3cf82acaea5a0e5023e087e0ca1e6a9d15d82 (patch) | |
| tree | 804ef3d3dce046e645bf9163d944fbf9d0f61e9a /src/server/game/Scripting | |
| parent | 26dcde94b383f2e7f6af2dc1ad4ab2806ff7ceda (diff) | |
Core/Game: Move scheduled map scripts counter methods into MapManager
* Since those have nothing to do with core scripts and are
not wished inside the ScriptMgr
Diffstat (limited to 'src/server/game/Scripting')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 77d747898f9..7b3dc3085e3 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -241,7 +241,7 @@ struct TSpellSummary } *SpellSummary; ScriptMgr::ScriptMgr() - : _scriptCount(0), _scheduledScripts(0), _script_loader_callback(nullptr) + : _scriptCount(0), _script_loader_callback(nullptr) { } diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index a94efc24e0d..5ec9c94a1e2 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1093,20 +1093,10 @@ class TC_GAME_API ScriptMgr void ModifyMeleeDamage(Unit* target, Unit* attacker, uint32& damage); void ModifySpellDamageTaken(Unit* target, Unit* attacker, int32& damage); - public: /* Scheduled scripts */ - - uint64 IncreaseScheduledScriptsCount() { return ++_scheduledScripts; } - uint64 DecreaseScheduledScriptCount() { return --_scheduledScripts; } - uint64 DecreaseScheduledScriptCount(uint64 count) { return _scheduledScripts -= count; } - bool IsScriptScheduled() const { return _scheduledScripts > 0; } - private: uint32 _scriptCount; - //atomic op counter for active scripts amount - std::atomic<uint64> _scheduledScripts; - ScriptLoaderCallbackType _script_loader_callback; }; |
