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/Events/GameEventMgr.cpp | |
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/Events/GameEventMgr.cpp')
-rw-r--r-- | src/server/game/Events/GameEventMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 3d991f77fd1..4c9e8df48fa 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1758,7 +1758,7 @@ void GameEventMgr::SetHolidayEventTime(GameEventData& event) bool singleDate = ((holiday->Date[0] >> 24) & 0x1F) == 31; // Events with fixed date within year have - 1 - time_t curTime = time(NULL); + time_t curTime = time(nullptr); for (int i = 0; i < MAX_HOLIDAY_DATES && holiday->Date[i]; ++i) { uint32 date = holiday->Date[i]; |