mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-20 10:23:53 +00:00
Code Issues Releases Wiki Activity

added enums for spells

Browse source
This commit is contained in:
Marek Kochanowicz 2014-07-25 11:25:36 +02:00
parent cdac934315
commit 864b93e745
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -175,6 +175,7 @@ namespace CSMWorld
{ ColumnId_Scope, "Scope" },
{ ColumnId_ReferenceableId, "Referenceable ID" },
{ ColumnId_InventoryItemId, "ID"},
{ ColumnId_SpellId, "ID"},
{ ColumnId_ItemCount, "Count"},
{ ColumnId_CombatState, "Combat" },
{ ColumnId_MagicState, "Magic" },

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

@ -180,6 +180,8 @@ namespace CSMWorld
ColumnId_BodyPartType = 165,
ColumnId_MeshType = 166,
ColumnId_ActorInventory = 167,
ColumnId_ActorSpells = 168,
ColumnId_SpellId = 169,
// Allocated to a separate value range, so we don't get a collision should we ever need
// to extend the number of use values.

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

@ -446,6 +446,7 @@ namespace CSMWorld
const RefIdColumn *mFight;
const RefIdColumn *mAlarm;
const RefIdColumn *mInventory;
const RefIdColumn *mSpells;
std::map<const RefIdColumn *, unsigned int> mServices;
ActorColumns (const NameColumns& base) : NameColumns (base) {}

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

@ -104,6 +104,10 @@ CSMWorld::RefIdCollection::RefIdCollection()
mColumns.back().addNestedColumn(Columns::ColumnId_InventoryItemId, CSMWorld::ColumnBase::Display_String);
mColumns.back().addNestedColumn(Columns::ColumnId_ItemCount, CSMWorld::ColumnBase::Display_Integer);
mColumns.push_back(RefIdColumn (Columns::ColumnId_ActorSpells, ColumnBase::Display_NestedSpellList, ColumnBase::Flag_Dialogue, true, true, true));
actorsColumns.mSpells = &mColumns.back();
mColumns.back().addNestedColumn(Columns::ColumnId_SpellId, CSMWorld::ColumnBase::Display_String);
static const struct
{
int mName;