mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-25 15:11:33 +00:00
Code Issues Releases Wiki Activity

Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.

Browse source 
(cherry picked from commit 258b2ba29a)
This commit is contained in:
cc9cii 2015-09-12 09:04:43 +10:00
parent 7c347a5908
commit 496cdcb51b
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ namespace CSMWorld
{ ColumnId_LevelledList,"Levelled List" }, { ColumnId_LevelledList,"Levelled List" },
{ ColumnId_LevelledItemId,"Levelled Item" }, { ColumnId_LevelledItemId,"Levelled Item" },
{ ColumnId_LevelledItemLevel,"Level" }, { ColumnId_LevelledItemLevel,"Item Level" },
{ ColumnId_LevelledItemType, "Calculate all levels <= player" }, { ColumnId_LevelledItemType, "Calculate all levels <= player" },
{ ColumnId_LevelledItemTypeEach, "Select a new item each instance" }, { ColumnId_LevelledItemTypeEach, "Select a new item each instance" },
{ ColumnId_LevelledItemChanceNone, "Chance None" }, { ColumnId_LevelledItemChanceNone, "Chance None" },
@ -281,26 +281,26 @@ namespace CSMWorld
{ ColumnId_InfoCondValue, "Values" }, { ColumnId_InfoCondValue, "Values" },
{ ColumnId_OriginalCell, "Original Cell" }, { ColumnId_OriginalCell, "Original Cell" },
{ ColumnId_NpcAttributes, "Attributes" }, { ColumnId_NpcAttributes, "NPC Attributes" },
{ ColumnId_NpcSkills, "Skills" }, { ColumnId_NpcSkills, "NPC Skill" },
{ ColumnId_UChar, "Value [0..255]" }, { ColumnId_UChar, "Value [0..255]" },
{ ColumnId_NpcMisc, "Misc" }, { ColumnId_NpcMisc, "NPC Misc" },
{ ColumnId_NpcLevel, "Level" }, { ColumnId_NpcLevel, "Level" },
{ ColumnId_NpcFactionID, "Faction ID" }, { ColumnId_NpcFactionID, "Faction ID" },
{ ColumnId_NpcHealth, "Health" }, { ColumnId_NpcHealth, "NPC Health" },
{ ColumnId_NpcMana, "Mana" }, { ColumnId_NpcMana, "Mana" },
{ ColumnId_NpcFatigue, "Fatigue" }, { ColumnId_NpcFatigue, "Fatigue" },
{ ColumnId_NpcDisposition, "Disposition" }, { ColumnId_NpcDisposition, "NPC Disposition" },
{ ColumnId_NpcReputation, "Reputation" }, { ColumnId_NpcReputation, "Reputation" },
{ ColumnId_NpcRank, "Rank" }, { ColumnId_NpcRank, "NPC Rank" },
{ ColumnId_NpcGold, "Gold" }, { ColumnId_NpcGold, "Gold" },
{ ColumnId_NpcPersistence, "Persistent" }, { ColumnId_NpcPersistence, "Persistent" },
{ ColumnId_RaceAttributes, "Attributes" }, { ColumnId_RaceAttributes, "Race Attributes" },
{ ColumnId_RaceMaleValue, "Male" }, { ColumnId_RaceMaleValue, "Male Attrib" },
{ ColumnId_RaceFemaleValue, "Female" }, { ColumnId_RaceFemaleValue, "Female Attrib" },
{ ColumnId_RaceSkillBonus, "Skill Bonus" }, { ColumnId_RaceSkillBonus, "Skill Bonus" },
{ ColumnId_RaceSkill, "Skills" }, { ColumnId_RaceSkill, "Race Skill" },
{ ColumnId_RaceBonus, "Bonus" }, { ColumnId_RaceBonus, "Bonus" },
{ ColumnId_Interior, "Interior" }, { ColumnId_Interior, "Interior" },