diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp index 8a1595a30e..6c31fddf39 100644 --- a/apps/opencs/model/world/columnimp.hpp +++ b/apps/opencs/model/world/columnimp.hpp @@ -257,7 +257,7 @@ namespace CSMWorld int mIndex; UseValueColumn (int index) - : Column (Columns::ColumnId_UseValue1 + index - 1, ColumnBase::Display_Float), + : Column (Columns::ColumnId_UseValue1 + index, ColumnBase::Display_Float), mIndex (index) {} @@ -339,7 +339,7 @@ namespace CSMWorld int mIndex; AttributesColumn (int index) - : Column (Columns::ColumnId_Attribute1 + index - 1, ColumnBase::Display_Attribute), + : Column (Columns::ColumnId_Attribute1 + index, ColumnBase::Display_Attribute), mIndex (index) {} @@ -372,7 +372,7 @@ namespace CSMWorld SkillsColumn (int index, bool typePrefix = false, bool major = false) : Column ((typePrefix ? ( major ? Columns::ColumnId_MajorSkill1 : Columns::ColumnId_MinorSkill1) : - Columns::ColumnId_Skill1) + index - 1, ColumnBase::Display_String), + Columns::ColumnId_Skill1) + index, ColumnBase::Display_String), mIndex (index), mMajor (major) {} diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp index 2198d1b0cc..f6eb8fe34e 100644 --- a/apps/opencs/model/world/columns.cpp +++ b/apps/opencs/model/world/columns.cpp @@ -166,10 +166,11 @@ namespace CSMWorld { ColumnId_MinorSkill5, "Minor Skill 5" }, { ColumnId_Skill1, "Skill 1" }, - { ColumnId_Skill1, "Skill 2" }, - { ColumnId_Skill1, "Skill 3" }, - { ColumnId_Skill1, "Skill 4" }, - { ColumnId_Skill1, "Skill 5" }, + { ColumnId_Skill2, "Skill 2" }, + { ColumnId_Skill3, "Skill 3" }, + { ColumnId_Skill4, "Skill 4" }, + { ColumnId_Skill5, "Skill 5" }, + { ColumnId_Skill6, "Skill 6" }, { -1, 0 } // end marker }; diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp index adde80dc92..28da60e938 100644 --- a/apps/opencs/model/world/columns.hpp +++ b/apps/opencs/model/world/columns.hpp @@ -171,7 +171,8 @@ namespace CSMWorld ColumnId_Skill2 = 0x50001, ColumnId_Skill3 = 0x50002, ColumnId_Skill4 = 0x50003, - ColumnId_Skill5 = 0x50004 + ColumnId_Skill5 = 0x50004, + ColumnId_Skill6 = 0x50005 }; std::string getName (ColumnId column);