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

Make sure ESM4 cell description is not empty

Browse Source 
To avoid logging empty cell descriptions on loading and unloading. Not all cells
have editor id but every has id and coordinates. Add world to distinguish cell
coordinates in different worldspaces.
This commit is contained in:
elsid 2023-07-30 16:19:36 +02:00
parent 385dab3df3
commit 22981af2ea
No known key found for this signature in database
GPG Key ID: 4DE04C198CBA7625
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
apps/openmw/mwworld/cell.cpp
View File

@ -1,15 +1,47 @@
#include "cell.hpp"
#include "esmstore.hpp"
#include "../mwbase/environment.hpp"
#include <components/esm3/loadcell.hpp>
#include <components/esm4/loadcell.hpp>
#include <components/esm4/loadwrld.hpp>
#include <components/misc/algorithm.hpp>
#include "../mwbase/environment.hpp"
#include "esmstore.hpp"
#include <stdexcept>
#include <string>
namespace MWWorld
{
namespace
{
std::string getDescription(const ESM4::World& value)
{
if (!value.mEditorId.empty())
return value.mEditorId;
return value.mId.serializeText();
}
std::string getCellDescription(const ESM4::Cell& cell, const ESM4::World* world)
{
std::string result;
if (!cell.mEditorId.empty())
result = cell.mEditorId;
else if (world != nullptr && cell.isExterior())
result = getDescription(*world);
else
result = cell.mId.serializeText();
if (cell.isExterior())
result += " (" + std::to_string(cell.mX) + ", " + std::to_string(cell.mY) + ")";
return result;
}
}
Cell::Cell(const ESM4::Cell& cell)
: ESM::CellVariant(cell)
, mIsExterior(!(cell.mCellFlags & ESM4::CELL_Interior))
@ -23,7 +55,6 @@ namespace MWWorld
, mId(cell.mId)
, mParent(cell.mParent)
, mWaterHeight(cell.mWaterHeight)
, mDescription(cell.mEditorId)
, mMood{
.mAmbiantColor = cell.mLighting.ambient,
.mDirectionalColor = cell.mLighting.directional,
@ -32,12 +63,15 @@ namespace MWWorld
.mFogDensity = 1.f,
}
{
const ESM4::World* world = MWBase::Environment::get().getESMStore()->get<ESM4::World>().search(mParent);
if (isExterior())
{
auto& worldStore = MWBase::Environment::get().getESMStore()->get<ESM4::World>();
const ESM4::World* cellWorld = worldStore.find(mParent);
mWaterHeight = cellWorld->mWaterLevel;
if (world == nullptr)
throw std::runtime_error(
"Cell " + cell.mId.toDebugString() + " parent world " + mParent.toDebugString() + " is not found");
mWaterHeight = world->mWaterLevel;
}
mDescription = getCellDescription(cell, world);
}
Cell::Cell(const ESM::Cell& cell)