mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-13 21:40:11 +00:00
Code Issues Projects Releases Wiki Activity

fixed some columns

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-08-24 16:51:49 +02:00
parent 51fbb0f3f4
commit 7aee1da5c6
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/opencs/model/world/columnimp.hpp
View File

@ -257,7 +257,7 @@ namespace CSMWorld
int mIndex; int mIndex;
UseValueColumn (int index) UseValueColumn (int index)
: Column<ESXRecordT> (Columns::ColumnId_UseValue1 + index - 1, ColumnBase::Display_Float), : Column<ESXRecordT> (Columns::ColumnId_UseValue1 + index, ColumnBase::Display_Float),
mIndex (index) mIndex (index)
{} {}
@ -339,7 +339,7 @@ namespace CSMWorld
int mIndex; int mIndex;
AttributesColumn (int index) AttributesColumn (int index)
: Column<ESXRecordT> (Columns::ColumnId_Attribute1 + index - 1, ColumnBase::Display_Attribute), : Column<ESXRecordT> (Columns::ColumnId_Attribute1 + index, ColumnBase::Display_Attribute),
mIndex (index) mIndex (index)
{} {}
@ -372,7 +372,7 @@ namespace CSMWorld
SkillsColumn (int index, bool typePrefix = false, bool major = false) SkillsColumn (int index, bool typePrefix = false, bool major = false)
: Column<ESXRecordT> ((typePrefix ? ( : Column<ESXRecordT> ((typePrefix ? (
major ? Columns::ColumnId_MajorSkill1 : Columns::ColumnId_MinorSkill1) : 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) mIndex (index), mMajor (major)
{} {}

9
apps/opencs/model/world/columns.cpp
View File

@ -166,10 +166,11 @@ namespace CSMWorld
{ ColumnId_MinorSkill5, "Minor Skill 5" }, { ColumnId_MinorSkill5, "Minor Skill 5" },
{ ColumnId_Skill1, "Skill 1" }, { ColumnId_Skill1, "Skill 1" },
{ ColumnId_Skill1, "Skill 2" }, { ColumnId_Skill2, "Skill 2" },
{ ColumnId_Skill1, "Skill 3" }, { ColumnId_Skill3, "Skill 3" },
{ ColumnId_Skill1, "Skill 4" }, { ColumnId_Skill4, "Skill 4" },
{ ColumnId_Skill1, "Skill 5" }, { ColumnId_Skill5, "Skill 5" },
{ ColumnId_Skill6, "Skill 6" },
{ -1, 0 } // end marker { -1, 0 } // end marker
}; };

3
apps/opencs/model/world/columns.hpp
View File

@ -171,7 +171,8 @@ namespace CSMWorld
ColumnId_Skill2 = 0x50001, ColumnId_Skill2 = 0x50001,
ColumnId_Skill3 = 0x50002, ColumnId_Skill3 = 0x50002,
ColumnId_Skill4 = 0x50003, ColumnId_Skill4 = 0x50003,
ColumnId_Skill5 = 0x50004 ColumnId_Skill5 = 0x50004,
ColumnId_Skill6 = 0x50005
}; };
std::string getName (ColumnId column); std::string getName (ColumnId column);