From 82f45966fc00106b52294e4c01a2848ba24e2eb8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 17 Dec 2010 13:43:24 +0100 Subject: Core/Unit: Renamed addUnitState/hasUnitState/clearUnitState to AddUnitState/HasUnitState/ClearUnitState Core/Vehicles: Allow the vehicle to always damage the passenger (removed unneded dbc hacks from scripts) --HG-- branch : trunk --- src/server/game/Grids/ObjectGridLoader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (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 4ee7fd69f76..41b48f23c08 100755 --- a/src/server/game/Grids/ObjectGridLoader.cpp +++ b/src/server/game/Grids/ObjectGridLoader.cpp @@ -94,11 +94,11 @@ class ObjectWorldLoader uint32 i_corpses; }; -template void addUnitState(T* /*obj*/, CellPair const& /*cell_pair*/) +template void AddUnitState(T* /*obj*/, CellPair const& /*cell_pair*/) { } -template<> void addUnitState(Creature *obj, CellPair const& cell_pair) +template<> void AddUnitState(Creature *obj, CellPair const& cell_pair) { Cell cell(cell_pair); @@ -109,7 +109,7 @@ template void AddObjectHelper(CellPair &cell, GridRefManager &m, uint32 &count, Map* map, T *obj) { obj->GetGridRef().link(&m, obj); - addUnitState(obj,cell); + AddUnitState(obj,cell); obj->AddToWorld(); if (obj->isActiveObject()) map->AddToActive(obj); -- cgit v1.2.3