mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-21 09:53:50 +00:00
Code Issues Releases Wiki Activity

fixed a column ID problem

Browse source
This commit is contained in:
Marc Zinnschlag 2014-03-20 14:19:50 +01:00
parent 20ea859aac
commit 1a1d52c513
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/model/world/columnimp.hpp
View file

@ -37,7 +37,6 @@ namespace CSMWorld
} }
}; };
/// \note Shares ID with IdColumn. A table can not have both.
template<typename ESXRecordT> template<typename ESXRecordT>
struct StringIdColumn : public Column<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> template<typename ESXRecordT>
struct IdColumn : public Column<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 virtual QVariant get (const Record<ESXRecordT>& record) const
{ {

3
apps/opencs/model/world/columns.cpp
View file

@ -172,7 +172,8 @@ namespace CSMWorld
{ ColumnId_Rank, "Rank" }, { ColumnId_Rank, "Rank" },
{ ColumnId_Gender, "Gender" }, { ColumnId_Gender, "Gender" },
{ ColumnId_PcRank, "PC Rank" }, { ColumnId_PcRank, "PC Rank" },
{ ColumnId_Scope, "Scope", }, { ColumnId_Scope, "Scope" },
{ ColumnId_ReferenceableId, "Referenceable ID" },
{ ColumnId_UseValue1, "Use value 1" }, { ColumnId_UseValue1, "Use value 1" },
{ ColumnId_UseValue2, "Use value 2" }, { ColumnId_UseValue2, "Use value 2" },

1
apps/opencs/model/world/columns.hpp
View file

@ -166,6 +166,7 @@ namespace CSMWorld
ColumnId_Gender = 153, ColumnId_Gender = 153,
ColumnId_PcRank = 154, ColumnId_PcRank = 154,
ColumnId_Scope = 155, ColumnId_Scope = 155,
ColumnId_ReferenceableId = 156,
// Allocated to a separate value range, so we don't get a collision should we ever need // Allocated to a separate value range, so we don't get a collision should we ever need
// to extend the number of use values. // to extend the number of use values.