some cleanup

deque
Marc Zinnschlag 10 years ago
parent 8062faa51a
commit e23a32c44f

@ -55,19 +55,16 @@ std::pair<char, bool> CSMWorld::ScriptContext::getMemberType (const std::string&
if (index!=-1) if (index!=-1)
{ {
// Referenceable found. // Referenceable found.
int columnIndex = mData.getReferenceables().searchColumnIndex (Columns::ColumnId_Script); int columnIndex = mData.getReferenceables().findColumnIndex (Columns::ColumnId_Script);
if (columnIndex!=-1) id2 = Misc::StringUtils::lowerCase (mData.getReferenceables().
getData (index, columnIndex).toString().toUtf8().constData());
if (!id2.empty())
{ {
id2 = Misc::StringUtils::lowerCase (mData.getReferenceables(). // Referenceable has a script -> use it.
getData (index, columnIndex).toString().toUtf8().constData()); index = mData.getScripts().searchId (id2);
reference = true;
if (!id2.empty())
{
// Referenceable has a script -> use it.
index = mData.getScripts().searchId (id2);
reference = true;
}
} }
} }
} }

Loading…
Cancel
Save