diff options
author | ariel- <ariel-@users.noreply.github.com> | 2017-12-13 14:43:12 -0300 |
---|---|---|
committer | ariel- <ariel-@users.noreply.github.com> | 2017-12-13 14:43:12 -0300 |
commit | 78a1c687a25d91dd6b13251f28d03ec6a0a49b8a (patch) | |
tree | d141b1a90ade918ed52a8e6217206010756321e3 /src/server/game/Scripting/ScriptMgr.h | |
parent | 57c13c539b91ff939bb600f6902c29f640289057 (diff) |
Core/Misc: minor typo and codestyle fixes
- Replace NULL uses in new code with nullptr
- Fix wrong (accumulated) load time log when loading calendar invites
- Make Creature::CanRegenerateHealth const as its just a getter
- Mark OnlyOnceAreaTriggerScript::OnTrigger as final in case someone wants to override that (you are supposed to use protected _OnTrigger hook)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.h')
-rw-r--r-- | src/server/game/Scripting/ScriptMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index d801aba496d..1a25d252b4a 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -453,7 +453,7 @@ class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript using AreaTriggerScript::AreaTriggerScript; public: - bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) override; + bool OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) final override; protected: virtual bool _OnTrigger(Player* /*player*/, AreaTriggerEntry const* /*trigger*/) = 0; |