From 88ae43fa516ec5b195bfb9047a6c140541fcab72 Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 13 Dec 2017 14:43:12 -0300 Subject: 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) (cherry picked from commit 78a1c687a25d91dd6b13251f28d03ec6a0a49b8a) --- src/server/game/Scripting/ScriptMgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Scripting') diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 49389fa1bcc..cf02fcad7a8 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -456,7 +456,7 @@ class TC_GAME_API OnlyOnceAreaTriggerScript : public AreaTriggerScript using AreaTriggerScript::AreaTriggerScript; public: - bool OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) override; + bool OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) final override; protected: virtual bool _OnTrigger(Player* player, AreaTriggerEntry const* trigger, bool entered) = 0; -- cgit v1.2.3