mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 03:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'rcutmore/bug-3331'

Browse Source
This commit is contained in:
Marc Zinnschlag 2016-05-09 09:18:48 +02:00
commit 64fdc5a21a
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/model/world/idtable.cpp
View File

@ -159,7 +159,9 @@ void CSMWorld::IdTable::addRecordWithData (const std::string& id,
mIdCollection->appendBlankRecord (id, type); mIdCollection->appendBlankRecord (id, type);
for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter) for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
{
mIdCollection->setData(index, iter->first, iter->second); mIdCollection->setData(index, iter->first, iter->second);
}
endInsertRows(); endInsertRows();
} }

9
apps/opencs/view/world/startscriptcreator.cpp
View File

@ -24,15 +24,6 @@ CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
); );
} }
void CSVWorld::StartScriptCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
{
CSMWorld::IdTable& table = getStartScriptsTable();
int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
// Set script ID to be added to start scripts table.
command.addValue(column, mScript->text());
}
CSVWorld::StartScriptCreator::StartScriptCreator( CSVWorld::StartScriptCreator::StartScriptCreator(
CSMWorld::Data &data, CSMWorld::Data &data,
QUndoStack &undoStack, QUndoStack &undoStack,

4
apps/opencs/view/world/startscriptcreator.hpp
View File

@ -31,10 +31,6 @@ namespace CSVWorld
/// \return reference to table containing start scripts. /// \return reference to table containing start scripts.
CSMWorld::IdTable& getStartScriptsTable() const; CSMWorld::IdTable& getStartScriptsTable() const;
/// \brief Add user input to command for creating start script.
/// \param command Creation command to configure.
virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
public: public:
StartScriptCreator( StartScriptCreator(