mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-25 06:35:30 +00:00
Merge remote-tracking branch 'cc9cii/records-without-name'
This commit is contained in:
commit
4106f8d867
@ -7,6 +7,8 @@
|
||||
#include "../world/idcollection.hpp"
|
||||
#include "../world/scope.hpp"
|
||||
|
||||
#include <components/esm/defs.hpp>
|
||||
|
||||
#include "savingstate.hpp"
|
||||
|
||||
namespace ESM
|
||||
@ -103,19 +105,14 @@ namespace CSMDoc
|
||||
if (state==CSMWorld::RecordBase::State_Modified ||
|
||||
state==CSMWorld::RecordBase::State_ModifiedOnly)
|
||||
{
|
||||
// FIXME: A quick Workaround to support SKIL records which should not write NAME.
|
||||
// If there are more idcollection records that don't use NAME then a more
|
||||
// generic solution may be required. The conversion code was simply
|
||||
// copied from esmwriter. There's room for improving speed a little bit
|
||||
// here if it turns out to be an issue.
|
||||
// FIXME: A quick Workaround to support records which should not write
|
||||
// NAME, including SKIL, MGEF and SCPT. If there are many more
|
||||
// idcollection records that doesn't use NAME then a more generic
|
||||
// solution may be required.
|
||||
uint32_t name = mCollection.getRecord (stage).mModified.sRecordId;
|
||||
mState.getWriter().startRecord (name);
|
||||
std::string type;
|
||||
for (int i=0; i<4; ++i)
|
||||
/// \todo make endianess agnostic
|
||||
type += reinterpret_cast<const char *> (&name)[i];
|
||||
|
||||
if(type != "SKIL")
|
||||
if(name != ESM::REC_SKIL && name != ESM::REC_MGEF && name != ESM::REC_SCPT)
|
||||
mState.getWriter().writeHNCString ("NAME", mCollection.getId (stage));
|
||||
mCollection.getRecord (stage).mModified.save (mState.getWriter());
|
||||
mState.getWriter().endRecord (mCollection.getRecord (stage).mModified.sRecordId);
|
||||
|
Loading…
x
Reference in New Issue
Block a user