mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-18 18:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1242 from Allofich/warnings

Browse Source 
Fix AppVeyor warnings
This commit is contained in:
scrawl 2017-03-29 07:28:00 +02:00 committed by GitHub
commit 3c9f3a0f7f
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwrender/objects.cpp
View File

@ -149,9 +149,9 @@ void Objects::removeCell(const MWWorld::CellStore* store)
if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData()) if (ptr.getClass().isNpc() && ptr.getRefData().getCustomData())
{ {
MWWorld::InventoryStore& store = ptr.getClass().getInventoryStore(ptr); MWWorld::InventoryStore& invStore = ptr.getClass().getInventoryStore(ptr);
store.setInvListener(NULL, ptr); invStore.setInvListener(NULL, ptr);
store.setContListener(NULL); invStore.setContListener(NULL);
} }
mObjects.erase(iter++); mObjects.erase(iter++);

3
components/esm/loadland.cpp
View File

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

4
components/esmterrain/storage.cpp
View File

@ -240,8 +240,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 = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE); int rowEnd = std::min(static_cast<int>(rowStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), ESM::Land::LAND_SIZE); int colEnd = std::min(static_cast<int>(colStart + std::min(1.f, size) * (ESM::Land::LAND_SIZE-1) + 1), static_cast<int>(ESM::Land::LAND_SIZE));
vertY = vertY_; vertY = vertY_;
for (int col=colStart; col<colEnd; col += increment) for (int col=colStart; col<colEnd; col += increment)