mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-28 19:21:04 +00:00
Merged pull request #1710)
This commit is contained in:
commit
ec900ef4ad
@ -105,7 +105,7 @@ namespace CSMWorld
|
|||||||
{ ColumnId_Respawn, "Respawn" },
|
{ ColumnId_Respawn, "Respawn" },
|
||||||
{ ColumnId_CreatureType, "Creature Type" },
|
{ ColumnId_CreatureType, "Creature Type" },
|
||||||
{ ColumnId_SoulPoints, "Soul Points" },
|
{ ColumnId_SoulPoints, "Soul Points" },
|
||||||
{ ColumnId_OriginalCreature, "Original Creature" },
|
{ ColumnId_ParentCreature, "Parent Creature" },
|
||||||
{ ColumnId_Biped, "Biped" },
|
{ ColumnId_Biped, "Biped" },
|
||||||
{ ColumnId_HasWeapon, "Has Weapon" },
|
{ ColumnId_HasWeapon, "Has Weapon" },
|
||||||
{ ColumnId_Swims, "Swims" },
|
{ ColumnId_Swims, "Swims" },
|
||||||
|
@ -99,7 +99,7 @@ namespace CSMWorld
|
|||||||
ColumnId_Respawn = 84,
|
ColumnId_Respawn = 84,
|
||||||
ColumnId_CreatureType = 85,
|
ColumnId_CreatureType = 85,
|
||||||
ColumnId_SoulPoints = 86,
|
ColumnId_SoulPoints = 86,
|
||||||
ColumnId_OriginalCreature = 87,
|
ColumnId_ParentCreature = 87,
|
||||||
ColumnId_Biped = 88,
|
ColumnId_Biped = 88,
|
||||||
ColumnId_HasWeapon = 89,
|
ColumnId_HasWeapon = 89,
|
||||||
// unused
|
// unused
|
||||||
|
@ -331,7 +331,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
|
|||||||
creatureColumns.mType = &mColumns.back();
|
creatureColumns.mType = &mColumns.back();
|
||||||
mColumns.push_back (RefIdColumn (Columns::ColumnId_Scale, ColumnBase::Display_Float));
|
mColumns.push_back (RefIdColumn (Columns::ColumnId_Scale, ColumnBase::Display_Float));
|
||||||
creatureColumns.mScale = &mColumns.back();
|
creatureColumns.mScale = &mColumns.back();
|
||||||
mColumns.push_back (RefIdColumn (Columns::ColumnId_OriginalCreature, ColumnBase::Display_Creature));
|
mColumns.push_back (RefIdColumn (Columns::ColumnId_ParentCreature, ColumnBase::Display_Creature));
|
||||||
creatureColumns.mOriginal = &mColumns.back();
|
creatureColumns.mOriginal = &mColumns.back();
|
||||||
|
|
||||||
static const struct
|
static const struct
|
||||||
|
Loading…
x
Reference in New Issue
Block a user