mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Fix for commit "d4972ab..." in PR 1208 (fixes #3751)

Browse Source 
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.

Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
This commit is contained in:
MAtahualpa 2017-02-16 00:08:38 +01:00
parent d4972ab166
commit 7be46eb1f0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/opencs/model/world/refidadapterimp.cpp
View File

@ -492,12 +492,12 @@ QVariant CSMWorld::CreatureRefIdAdapter::getData (const RefIdColumn *column, con
if (column == mColumns.mBloodType)
{
int mask = ESM::Creature::Flags::Skeleton | ESM::Creature::Flags::Metal;
int mask = ESM::Creature::Skeleton | ESM::Creature::Metal;
if ((record.get().mFlags & mask) == ESM::Creature::Flags::Skeleton)
if ((record.get().mFlags & mask) == ESM::Creature::Skeleton)
return 1;
if ((record.get().mFlags & mask) == ESM::Creature::Flags::Metal)
if ((record.get().mFlags & mask) == ESM::Creature::Metal)
return 2;
return 0;
@ -528,12 +528,12 @@ void CSMWorld::CreatureRefIdAdapter::setData (const RefIdColumn *column, RefIdDa
creature.mOriginal = value.toString().toUtf8().constData();
else if (column == mColumns.mBloodType)
{
int mask = !(ESM::Creature::Flags::Skeleton | ESM::Creature::Flags::Metal);
int mask = ~(ESM::Creature::Skeleton | ESM::Creature::Metal);
if (value.toInt() == 1)
creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Flags::Skeleton;
creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Skeleton;
else if (value.toInt() == 2)
creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Flags::Metal;
creature.mFlags = (creature.mFlags & mask) | ESM::Creature::Metal;
else
creature.mFlags = creature.mFlags & mask;
}
@ -763,12 +763,12 @@ QVariant CSMWorld::NpcRefIdAdapter::getData (const RefIdColumn *column, const Re
if (column == mColumns.mBloodType)
{
int mask = ESM::NPC::Flags::Skeleton | ESM::NPC::Flags::Metal;
int mask = ESM::NPC::Skeleton | ESM::NPC::Metal;
if ((record.get().mFlags & mask) == ESM::NPC::Flags::Skeleton)
if ((record.get().mFlags & mask) == ESM::NPC::Skeleton)
return 1;
if ((record.get().mFlags & mask) == ESM::NPC::Flags::Metal)
if ((record.get().mFlags & mask) == ESM::NPC::Metal)
return 2;
return 0;
@ -803,12 +803,12 @@ void CSMWorld::NpcRefIdAdapter::setData (const RefIdColumn *column, RefIdData& d
npc.mHead = value.toString().toUtf8().constData();
else if (column == mColumns.mBloodType)
{
int mask = !(ESM::NPC::Flags::Skeleton | ESM::NPC::Flags::Metal);
int mask = ~(ESM::NPC::Skeleton | ESM::NPC::Metal);
if (value.toInt() == 1)
npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Flags::Skeleton;
npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Skeleton;
else if (value.toInt() == 2)
npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Flags::Metal;
npc.mFlags = (npc.mFlags & mask) | ESM::NPC::Metal;
else
npc.mFlags = npc.mFlags & mask;
}