krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Cleanup post merge.

Browse source
This commit is contained in:
cc9cii 2015-04-17 13:45:45 +10:00
parent 47d5eac290
commit c41b4b84a6
5 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/opencs/model/world/columnbase.hpp
View file

@ -93,15 +93,6 @@ namespace CSMWorld
Display_RefRecordType, Display_RefRecordType,
Display_DialogueType, Display_DialogueType,
Display_QuestStatusType, Display_QuestStatusType,
//Those are top level columns that nest other columns
Display_NestedItemList, // delete?
Display_NestedSpellList, // delete?
Display_NestedDestinationsList, // delete?
Display_PathgridPointList, // delete?
Display_PathgridEdgeList, // delete?
Display_NestedHeader,
Display_EnchantmentType, Display_EnchantmentType,
Display_BodyPartType, Display_BodyPartType,
Display_MeshType, Display_MeshType,
@ -117,7 +108,10 @@ namespace CSMWorld
Display_ScriptLines, // console context Display_ScriptLines, // console context
Display_SoundGeneratorType, Display_SoundGeneratorType,
Display_School, Display_School,
Display_Id Display_Id,
//top level columns that nest other columns
Display_NestedHeader
}; };
int mColumnId; int mColumnId;
@ -135,7 +129,7 @@ namespace CSMWorld
virtual std::string getTitle() const; virtual std::string getTitle() const;
virtual int getId() const; // FIXME: why have an accessor for a public member? virtual int getId() const;
static bool isId (Display display); static bool isId (Display display);

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

@ -269,6 +269,8 @@ namespace CSMWorld
{ ColumnId_LevelledItemType, "Type" }, { ColumnId_LevelledItemType, "Type" },
{ ColumnId_LevelledItemChanceNone, "Chance None" }, { ColumnId_LevelledItemChanceNone, "Chance None" },
{ ColumnId_PowerList, "Powers" },
{ ColumnId_UseValue1, "Use value 1" }, { ColumnId_UseValue1, "Use value 1" },
{ ColumnId_UseValue2, "Use value 2" }, { ColumnId_UseValue2, "Use value 2" },
{ ColumnId_UseValue3, "Use value 3" }, { ColumnId_UseValue3, "Use value 3" },

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

@ -259,6 +259,8 @@ namespace CSMWorld
ColumnId_LevelledItemType = 236, ColumnId_LevelledItemType = 236,
ColumnId_LevelledItemChanceNone = 237, ColumnId_LevelledItemChanceNone = 237,
ColumnId_PowerList = 238,
// 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.
ColumnId_UseValue1 = 0x10000, ColumnId_UseValue1 = 0x10000,

4
apps/opencs/model/world/data.cpp
View file

@ -131,7 +131,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, true)); mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, true));
mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, false)); mRaces.addColumn (new WeightHeightColumn<ESM::Race> (false, false));
// Race spells // Race spells
mRaces.addColumn (new NestedParentColumn<ESM::Race> (Columns::ColumnId_SpellList)); mRaces.addColumn (new NestedParentColumn<ESM::Race> (Columns::ColumnId_PowerList));
index = mRaces.getColumns()-1; index = mRaces.getColumns()-1;
mRaces.addAdapter (std::make_pair(&mRaces.getColumn(index), new SpellListAdapter<ESM::Race> ())); mRaces.addAdapter (std::make_pair(&mRaces.getColumn(index), new SpellListAdapter<ESM::Race> ()));
mRaces.getNestableColumn(index)->addColumn( mRaces.getNestableColumn(index)->addColumn(
@ -172,7 +172,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mBirthsigns.addColumn (new TextureColumn<ESM::BirthSign>); mBirthsigns.addColumn (new TextureColumn<ESM::BirthSign>);
mBirthsigns.addColumn (new DescriptionColumn<ESM::BirthSign>); mBirthsigns.addColumn (new DescriptionColumn<ESM::BirthSign>);
// Birthsign spells // Birthsign spells
mBirthsigns.addColumn (new NestedParentColumn<ESM::BirthSign> (Columns::ColumnId_SpellList)); mBirthsigns.addColumn (new NestedParentColumn<ESM::BirthSign> (Columns::ColumnId_PowerList));
index = mBirthsigns.getColumns()-1; index = mBirthsigns.getColumns()-1;
mBirthsigns.addAdapter (std::make_pair(&mBirthsigns.getColumn(index), mBirthsigns.addAdapter (std::make_pair(&mBirthsigns.getColumn(index),
new SpellListAdapter<ESM::BirthSign> ())); new SpellListAdapter<ESM::BirthSign> ()));

8
apps/opencs/model/world/refidcollection.cpp
View file

@ -126,7 +126,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
// Nested table // Nested table
mColumns.push_back(RefIdColumn (Columns::ColumnId_ActorInventory, mColumns.push_back(RefIdColumn (Columns::ColumnId_ActorInventory,
ColumnBase::Display_NestedItemList, ColumnBase::Flag_Dialogue)); ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue));
actorsColumns.mInventory = &mColumns.back(); actorsColumns.mInventory = &mColumns.back();
std::map<UniversalId::Type, NestedRefIdAdapterBase*> inventoryMap; std::map<UniversalId::Type, NestedRefIdAdapterBase*> inventoryMap;
inventoryMap.insert(std::make_pair(UniversalId::Type_Npc, inventoryMap.insert(std::make_pair(UniversalId::Type_Npc,
@ -141,7 +141,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
// Nested table // Nested table
mColumns.push_back(RefIdColumn (Columns::ColumnId_SpellList, mColumns.push_back(RefIdColumn (Columns::ColumnId_SpellList,
ColumnBase::Display_NestedSpellList, ColumnBase::Flag_Dialogue)); ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue));
actorsColumns.mSpells = &mColumns.back(); actorsColumns.mSpells = &mColumns.back();
std::map<UniversalId::Type, NestedRefIdAdapterBase*> spellsMap; std::map<UniversalId::Type, NestedRefIdAdapterBase*> spellsMap;
spellsMap.insert(std::make_pair(UniversalId::Type_Npc, spellsMap.insert(std::make_pair(UniversalId::Type_Npc,
@ -154,7 +154,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
// Nested table // Nested table
mColumns.push_back(RefIdColumn (Columns::ColumnId_NpcDestinations, mColumns.push_back(RefIdColumn (Columns::ColumnId_NpcDestinations,
ColumnBase::Display_NestedDestinationsList, ColumnBase::Flag_Dialogue)); ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue));
actorsColumns.mDestinations = &mColumns.back(); actorsColumns.mDestinations = &mColumns.back();
std::map<UniversalId::Type, NestedRefIdAdapterBase*> destMap; std::map<UniversalId::Type, NestedRefIdAdapterBase*> destMap;
destMap.insert(std::make_pair(UniversalId::Type_Npc, destMap.insert(std::make_pair(UniversalId::Type_Npc,
@ -281,7 +281,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
// Nested table // Nested table
mColumns.push_back(RefIdColumn (Columns::ColumnId_ContainerContent, mColumns.push_back(RefIdColumn (Columns::ColumnId_ContainerContent,
ColumnBase::Display_NestedItemList, ColumnBase::Flag_Dialogue)); ColumnBase::Display_NestedHeader, ColumnBase::Flag_Dialogue));
const RefIdColumn *content = &mColumns.back(); const RefIdColumn *content = &mColumns.back();
std::map<UniversalId::Type, NestedRefIdAdapterBase*> contMap; std::map<UniversalId::Type, NestedRefIdAdapterBase*> contMap;
contMap.insert(std::make_pair(UniversalId::Type_Container, contMap.insert(std::make_pair(UniversalId::Type_Container,