From 78a1c687a25d91dd6b13251f28d03ec6a0a49b8a 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) --- src/server/game/Grids/ObjectGridLoader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/game/Grids/ObjectGridLoader.cpp') diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp index 4dfca6f98c0..080f43ad8e4 100644 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -143,7 +143,7 @@ void LoadHelper(CellGuidSet const& guid_set, CellCoord &cell, GridRefManager // If script is blocking spawn, don't spawn but queue for a re-check in a little bit if (!(group->flags & SPAWNGROUP_FLAG_COMPATIBILITY_MODE) && !sScriptMgr->CanSpawn(guid, cdata->id, cdata, map)) { - map->SaveRespawnTime(SPAWN_TYPE_CREATURE, guid, cdata->id, time(NULL) + urand(4,7), map->GetZoneId(cdata->spawnPoint), Trinity::ComputeGridCoord(cdata->spawnPoint.GetPositionX(), cdata->spawnPoint.GetPositionY()).GetId(), false); + map->SaveRespawnTime(SPAWN_TYPE_CREATURE, guid, cdata->id, time(nullptr) + urand(4,7), map->GetZoneId(cdata->spawnPoint), Trinity::ComputeGridCoord(cdata->spawnPoint.GetPositionX(), cdata->spawnPoint.GetPositionY()).GetId(), false); delete obj; continue; } -- cgit v1.2.3