mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 05:15:33 +00:00
Code Issues Releases Wiki Activity

getting rid of the asserts

Browse source
This commit is contained in:
Marek Kochanowicz 2014-07-21 14:44:48 +02:00
parent cb004936e0
commit c018ca43ac
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/opencs/model/world/refidadapterimp.cpp
View file

@ -223,7 +223,10 @@ QVariant CSMWorld::ContainerRefIdAdapter::getData (const RefIdColumn *column, co
void CSMWorld::ContainerRefIdAdapter::removeNestedRow (const RefIdColumn *column, RefIdData& data, int index, int rowToRemove) const void CSMWorld::ContainerRefIdAdapter::removeNestedRow (const RefIdColumn *column, RefIdData& data, int index, int rowToRemove) const
{ {
assert(column==mContent); if(column!=mContent)
{
throw std::logic_error("This column does not hold multiple values.");
}
std::vector<ESM::ContItem>& list = static_cast<Record<ESM::Container>&> ( std::vector<ESM::ContItem>& list = static_cast<Record<ESM::Container>&> (
data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container))).get().mInventory.mList; data.getRecord (RefIdData::LocalIndex (index, UniversalId::Type_Container))).get().mInventory.mList;
@ -289,7 +292,7 @@ void CSMWorld::ContainerRefIdAdapter::setNestedData(const RefIdColumn *column,
mHelper.setNestedData(column, data, index, value, subRowIndex, subColIndex); mHelper.setNestedData(column, data, index, value, subRowIndex, subColIndex);
} else } else
{ {
assert(false); throw std::logic_error("This column do not nest other columns");
} }
} }
@ -319,7 +322,7 @@ QVariant CSMWorld::ContainerRefIdAdapter::getNestedData (const CSMWorld::RefIdCo
return mHelper.getNestedData(column, data, index, subRowIndex, subColIndex); return mHelper.getNestedData(column, data, index, subRowIndex, subColIndex);
} else } else
{ {
throw std::logic_error("This column does not hold multiple values."); throw std::logic_error("This column do not nest other columns");
} }
} }