1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 10:39:39 +00:00

some updates after terrain merge

This commit is contained in:
Nikolay Kasyanov 2012-03-31 14:56:54 +04:00
parent 523648dbb1
commit 006e1cde85

View file

@ -180,12 +180,10 @@ void Debugging::enableCellPathgrid(MWWorld::Ptr::CellStore *store)
if (!pathgrid) return; if (!pathgrid) return;
Vector3 cellPathGridPos; Vector3 cellPathGridPos;
/// \todo replace tests like this with isExterior method of ESM::Cell after merging with terrain branch if (store->cell->isExterior())
if (!(store->cell->data.flags & ESM::Cell::Interior))
{ {
/// \todo Replace with ESM::Land::REAL_SIZE after merging with terrain branch cellPathGridPos.x = store->cell->data.gridX * ESM::Land::REAL_SIZE;
cellPathGridPos.x = store->cell->data.gridX * 8192; cellPathGridPos.y = store->cell->data.gridY * ESM::Land::REAL_SIZE;
cellPathGridPos.y = store->cell->data.gridY * 8192;
} }
SceneNode *cellPathGrid = mPathGridRoot->createChildSceneNode(cellPathGridPos); SceneNode *cellPathGrid = mPathGridRoot->createChildSceneNode(cellPathGridPos);
ESM::Pathgrid::PointList points = pathgrid->points; ESM::Pathgrid::PointList points = pathgrid->points;
@ -207,7 +205,7 @@ void Debugging::enableCellPathgrid(MWWorld::Ptr::CellStore *store)
Vector3(p2.x, p2.y, p2.z))); Vector3(p2.x, p2.y, p2.z)));
} }
if (!(store->cell->data.flags & ESM::Cell::Interior)) if (store->cell->isExterior())
{ {
mExteriorPathgridNodes[std::make_pair(store->cell->data.gridX, store->cell->data.gridY)] = cellPathGrid; mExteriorPathgridNodes[std::make_pair(store->cell->data.gridX, store->cell->data.gridY)] = cellPathGrid;
} }
@ -220,7 +218,7 @@ void Debugging::enableCellPathgrid(MWWorld::Ptr::CellStore *store)
void Debugging::disableCellPathgrid(MWWorld::Ptr::CellStore *store) void Debugging::disableCellPathgrid(MWWorld::Ptr::CellStore *store)
{ {
if (!(store->cell->data.flags & ESM::Cell::Interior)) if (store->cell->isExterior())
{ {
ExteriorPathgridNodes::iterator it = ExteriorPathgridNodes::iterator it =
mExteriorPathgridNodes.find(std::make_pair(store->cell->data.gridX, store->cell->data.gridY)); mExteriorPathgridNodes.find(std::make_pair(store->cell->data.gridX, store->cell->data.gridY));