teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix handling in fillVertexBuffers when the chunk is >1 ESM::Cell

Browse source
This commit is contained in:
scrawl 2017-03-08 17:44:54 +01:00
parent 819860081f
commit b384087e28
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/esm/loadland.cpp
View file

@ -335,4 +335,7 @@ namespace ESM
} }
} }
} }
const int Land::LAND_SIZE;
} }

4
components/esmterrain/storage.cpp
View file

@ -232,8 +232,8 @@ namespace ESMTerrain
// Only relevant for chunks smaller than (contained in) one cell // Only relevant for chunks smaller than (contained in) one cell
rowStart += (origin.x() - startCellX) * ESM::Land::LAND_SIZE; rowStart += (origin.x() - startCellX) * ESM::Land::LAND_SIZE;
colStart += (origin.y() - startCellY) * ESM::Land::LAND_SIZE; colStart += (origin.y() - startCellY) * ESM::Land::LAND_SIZE;
int rowEnd = rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1; int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE);
int colEnd = colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1; int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE);
vertY = vertY_; vertY = vertY_;
for (int col=colStart; col<colEnd; col += increment) for (int col=colStart; col<colEnd; col += increment)