mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 21:23:52 +00:00
fixed a column ID problem
This commit is contained in:
parent
20ea859aac
commit
1a1d52c513
3 changed files with 5 additions and 4 deletions
|
@ -37,7 +37,6 @@ namespace CSMWorld
|
|||
}
|
||||
};
|
||||
|
||||
/// \note Shares ID with IdColumn. A table can not have both.
|
||||
template<typename ESXRecordT>
|
||||
struct StringIdColumn : public Column<ESXRecordT>
|
||||
{
|
||||
|
@ -838,11 +837,11 @@ namespace CSMWorld
|
|||
}
|
||||
};
|
||||
|
||||
/// \note Shares ID with StringIdColumn. A table can not have both.
|
||||
template<typename ESXRecordT>
|
||||
struct IdColumn : public Column<ESXRecordT>
|
||||
{
|
||||
IdColumn() : Column<ESXRecordT> (Columns::ColumnId_Id, ColumnBase::Display_String) {}
|
||||
IdColumn() : Column<ESXRecordT> (Columns::ColumnId_ReferenceableId,
|
||||
ColumnBase::Display_Referenceable) {}
|
||||
|
||||
virtual QVariant get (const Record<ESXRecordT>& record) const
|
||||
{
|
||||
|
|
|
@ -172,7 +172,8 @@ namespace CSMWorld
|
|||
{ ColumnId_Rank, "Rank" },
|
||||
{ ColumnId_Gender, "Gender" },
|
||||
{ ColumnId_PcRank, "PC Rank" },
|
||||
{ ColumnId_Scope, "Scope", },
|
||||
{ ColumnId_Scope, "Scope" },
|
||||
{ ColumnId_ReferenceableId, "Referenceable ID" },
|
||||
|
||||
{ ColumnId_UseValue1, "Use value 1" },
|
||||
{ ColumnId_UseValue2, "Use value 2" },
|
||||
|
|
|
@ -166,6 +166,7 @@ namespace CSMWorld
|
|||
ColumnId_Gender = 153,
|
||||
ColumnId_PcRank = 154,
|
||||
ColumnId_Scope = 155,
|
||||
ColumnId_ReferenceableId = 156,
|
||||
|
||||
// Allocated to a separate value range, so we don't get a collision should we ever need
|
||||
// to extend the number of use values.
|
||||
|
|
Loading…
Reference in a new issue