mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-07-05 03:11:35 +00:00
Code Issues Releases Wiki Activity

Update original cell column and do not modify the refnum when moving a reference to another cell with 3D editing.

Browse source
This commit is contained in:
cc9cii 2021-08-28 16:11:47 +10:00
parent 2eb210f31a
commit b0d5ca386d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/opencs/view/render/object.cpp
View file

@ -682,18 +682,20 @@ void CSVRender::Object::apply (CSMWorld::CommandMacro& commands)
int cellColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> ( int cellColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> (
CSMWorld::Columns::ColumnId_Cell)); CSMWorld::Columns::ColumnId_Cell));
int refNumColumn = collection.findColumnIndex (static_cast<CSMWorld::Columns::ColumnId> ( int origCellColumn = collection.findColumnIndex(static_cast<CSMWorld::Columns::ColumnId> (
CSMWorld::Columns::ColumnId_RefNum)); CSMWorld::Columns::ColumnId_OriginalCell));
if (cellIndex != originalIndex) if (cellIndex != originalIndex)
{ {
/// \todo figure out worldspace (not important until multiple worldspaces are supported) /// \todo figure out worldspace (not important until multiple worldspaces are supported)
std::string origCellId = CSMWorld::CellCoordinates(originalIndex).getId("");
std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId (""); std::string cellId = CSMWorld::CellCoordinates (cellIndex).getId ("");
commands.push (new CSMWorld::ModifyCommand (*model, commands.push (new CSMWorld::ModifyCommand (*model,
model->index (recordIndex, cellColumn), QString::fromUtf8 (cellId.c_str()))); model->index (recordIndex, origCellColumn), QString::fromUtf8 (origCellId.c_str())));
commands.push(new CSMWorld::ModifyCommand(*model, commands.push(new CSMWorld::ModifyCommand(*model,
model->index (recordIndex, refNumColumn), 0)); model->index(recordIndex, cellColumn), QString::fromUtf8(cellId.c_str())));
// NOTE: refnum is not modified for moving a reference to another cell
} }
} }