mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 12:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix Gender column filtering (bug #4601) and correct filter descs

Browse Source
This commit is contained in:
Capostrophic 2020-03-22 22:01:49 +03:00
parent d8e1a6b286
commit 18bfc6f2c5
6 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -43,6 +43,7 @@
Bug #4594: Actors without AI packages don't use Hello dialogue Bug #4594: Actors without AI packages don't use Hello dialogue
Bug #4598: Script parser does not support non-ASCII characters Bug #4598: Script parser does not support non-ASCII characters
Bug #4600: Crash when no sound output is available or --no-sound is used. Bug #4600: Crash when no sound output is available or --no-sound is used.
Bug #4601: Filtering referenceables by gender is broken
Bug #4639: Black screen after completing first mages guild mission + training Bug #4639: Black screen after completing first mages guild mission + training
Bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog Bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
Bug #4680: Heap corruption on faulty esp Bug #4680: Heap corruption on faulty esp

2
apps/opencs/model/world/columnimp.hpp
View File

@ -1770,7 +1770,7 @@ namespace CSMWorld
struct GenderNpcColumn : public Column<ESXRecordT> struct GenderNpcColumn : public Column<ESXRecordT>
{ {
GenderNpcColumn() GenderNpcColumn()
: Column<ESXRecordT>(Columns::ColumnId_GenderNpc, ColumnBase::Display_GenderNpc) : Column<ESXRecordT>(Columns::ColumnId_Gender, ColumnBase::Display_GenderNpc)
{} {}
virtual QVariant get(const Record<ESXRecordT>& record) const virtual QVariant get(const Record<ESXRecordT>& record) const

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

@ -288,7 +288,6 @@ namespace CSMWorld
{ ColumnId_UChar, "Value [0..255]" }, { ColumnId_UChar, "Value [0..255]" },
{ ColumnId_NpcMisc, "NPC Misc" }, { ColumnId_NpcMisc, "NPC Misc" },
{ ColumnId_Level, "Level" }, { ColumnId_Level, "Level" },
{ ColumnId_GenderNpc, "Gender"},
{ ColumnId_Mana, "Mana" }, { ColumnId_Mana, "Mana" },
{ ColumnId_Fatigue, "Fatigue" }, { ColumnId_Fatigue, "Fatigue" },
{ ColumnId_NpcDisposition, "NPC Disposition" }, { ColumnId_NpcDisposition, "NPC Disposition" },

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

@ -273,7 +273,7 @@ namespace CSMWorld
ColumnId_UChar = 250, ColumnId_UChar = 250,
ColumnId_NpcMisc = 251, ColumnId_NpcMisc = 251,
ColumnId_Level = 252, ColumnId_Level = 252,
ColumnId_GenderNpc = 254, // unused
ColumnId_Mana = 255, ColumnId_Mana = 255,
ColumnId_Fatigue = 256, ColumnId_Fatigue = 256,
ColumnId_NpcDisposition = 257, ColumnId_NpcDisposition = 257,

2
apps/opencs/model/world/refidcollection.cpp
View File

@ -486,7 +486,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
mColumns.push_back (RefIdColumn (Columns::ColumnId_Head, ColumnBase::Display_BodyPart)); mColumns.push_back (RefIdColumn (Columns::ColumnId_Head, ColumnBase::Display_BodyPart));
npcColumns.mHead = &mColumns.back(); npcColumns.mHead = &mColumns.back();
mColumns.push_back (RefIdColumn (Columns::ColumnId_GenderNpc, ColumnBase::Display_GenderNpc)); mColumns.push_back (RefIdColumn (Columns::ColumnId_Gender, ColumnBase::Display_GenderNpc));
npcColumns.mGender = &mColumns.back(); npcColumns.mGender = &mColumns.back();
npcColumns.mFlags.insert (std::make_pair (essential, ESM::NPC::Essential)); npcColumns.mFlags.insert (std::make_pair (essential, ESM::NPC::Essential));

BIN
files/opencs/defaultfilters
View File

Binary file not shown.