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

check for land index not -1, fix warning

Browse Source 
Signed-off-by: Sam Hellawell <sshellawell@gmail.com>
This commit is contained in:
Sam Hellawell 2024-03-16 09:02:47 +00:00
parent 5fca45565c
commit a62da201e5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/opencs/model/world/regionmap.cpp
View File

@ -29,9 +29,11 @@ namespace CSMWorld
{ {
const IdCollection<Land>& lands = data.getLand(); const IdCollection<Land>& lands = data.getLand();
int landIndex = lands.searchId(cell.mId); int landIndex = lands.searchId(cell.mId);
const Land& land = lands.getRecord(landIndex).get(); if (landIndex == -1)
return 0.0f;
// If any part of land is above water, returns > 0 - otherwise returns < 0 // If any part of land is above water, returns > 0 - otherwise returns < 0
const Land& land = lands.getRecord(landIndex).get();
if (land.getLandData()) if (land.getLandData())
return land.getLandData()->mMaxHeight - cell.mWater; return land.getLandData()->mMaxHeight - cell.mWater;

1
apps/opencs/view/world/regionmap.cpp
View File

@ -364,7 +364,6 @@ std::vector<CSMWorld::UniversalId> CSVWorld::RegionMap::getDraggedRecords() cons
void CSVWorld::RegionMap::dragMoveEvent(QDragMoveEvent* event) void CSVWorld::RegionMap::dragMoveEvent(QDragMoveEvent* event)
{ {
QModelIndex index = indexAt(event->pos());
const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData()); const CSMWorld::TableMimeData* mime = dynamic_cast<const CSMWorld::TableMimeData*>(event->mimeData());
if (mime != nullptr && (mime->holdsType(CSMWorld::UniversalId::Type_Region))) if (mime != nullptr && (mime->holdsType(CSMWorld::UniversalId::Type_Region)))
{ {