From bb997f6cae4e9ad9239a89c61f34f24b94635471 Mon Sep 17 00:00:00 2001 From: Itms Date: Sat, 3 Oct 2015 10:32:30 +0000 Subject: [PATCH] Fix previous commit. This was SVN commit r17096. --- source/simulation2/components/CCmpObstructionManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/simulation2/components/CCmpObstructionManager.cpp b/source/simulation2/components/CCmpObstructionManager.cpp index 13a67c99ac..dc122aa3f9 100644 --- a/source/simulation2/components/CCmpObstructionManager.cpp +++ b/source/simulation2/components/CCmpObstructionManager.cpp @@ -647,7 +647,7 @@ private: return (m_WorldX0 <= p.X && p.X <= m_WorldX1 && m_WorldZ0 <= p.Y && p.Y <= m_WorldZ1); } - void RasterizeHelper(Grid& grid, ICmpObstructionManager::flags_t requireMask, bool fullUpdate, u64 appliedMask, entity_pos_t clearance = fixed::Zero()); + void RasterizeHelper(Grid& grid, ICmpObstructionManager::flags_t requireMask, bool fullUpdate, pass_class_t appliedMask, entity_pos_t clearance = fixed::Zero()); }; REGISTER_COMPONENT_TYPE(ObstructionManager) @@ -871,7 +871,7 @@ void CCmpObstructionManager::Rasterize(Grid& grid, const std::vecto m_DirtyUnitShapes.clear(); } -void CCmpObstructionManager::RasterizeHelper(Grid& grid, ICmpObstructionManager::flags_t requireMask, bool fullUpdate, u64 appliedMask, entity_pos_t clearance) +void CCmpObstructionManager::RasterizeHelper(Grid& grid, ICmpObstructionManager::flags_t requireMask, bool fullUpdate, pass_class_t appliedMask, entity_pos_t clearance) { for (auto& pair : m_StaticShapes) {