mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 19:06:40 +00:00
Code Issues Releases Wiki Activity

Fix the ESM::LandTexture NAME being discarded on loading

Browse source
This commit is contained in:
scrawl 2015-08-22 13:10:54 +02:00
parent 031d64d0d3
commit 32ad8c86bf
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/doc/savingstages.cpp
View file

@ -454,6 +454,8 @@ void CSMDoc::WriteLandTextureCollectionStage::perform (int stage, Messages& mess
mState.getWriter().startRecord (record.sRecordId); mState.getWriter().startRecord (record.sRecordId);
mState.getWriter().writeHNString("NAME", record.mId);
record.save (mState.getWriter()); record.save (mState.getWriter());
mState.getWriter().endRecord (record.sRecordId); mState.getWriter().endRecord (record.sRecordId);

8
apps/opencs/model/world/landtexture.cpp
View file

@ -9,13 +9,7 @@ namespace CSMWorld
{ {
ESM::LandTexture::load(esm); ESM::LandTexture::load(esm);
int plugin = esm.getIndex(); mPluginIndex = esm.getIndex();
std::ostringstream stream;
stream << mIndex << "_" << plugin;
mId = stream.str();
} }
} }

7
apps/opencs/model/world/landtexture.hpp
View file

@ -7,13 +7,10 @@
namespace CSMWorld namespace CSMWorld
{ {
/// \brief Wrapper for LandTexture record. Encodes mIndex and the plugin index (obtained from ESMReader) /// \brief Wrapper for LandTexture record, providing info which plugin the LandTexture was loaded from.
/// in the ID.
///
/// \attention The mId field of the ESM::LandTexture struct is not used.
struct LandTexture : public ESM::LandTexture struct LandTexture : public ESM::LandTexture
{ {
std::string mId; int mPluginIndex;
void load (ESM::ESMReader &esm); void load (ESM::ESMReader &esm);
}; };

14
apps/opencs/view/render/terrainstorage.cpp
View file

@ -29,10 +29,18 @@ namespace CSVRender
const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin) const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
{ {
std::ostringstream stream; int numRecords = mData.getLandTextures().getSize();
stream << index << "_" << plugin;
return &mData.getLandTextures().getRecord(stream.str()).get(); for (int i=0; i<numRecords; ++i)
{
const CSMWorld::LandTexture* ltex = &mData.getLandTextures().getRecord(i).get();
if (ltex->mIndex == index && ltex->mPluginIndex == plugin)
return ltex;
}
std::stringstream error;
error << "Can't find LandTexture " << index << " from plugin " << plugin;
throw std::runtime_error(error.str());
} }
void TerrainStorage::getBounds(float &minX, float &maxX, float &minY, float &maxY) void TerrainStorage::getBounds(float &minX, float &maxX, float &minY, float &maxY)