From 18bfc6f2c59ccd06ffadd3c602bebb1982d2c5dc Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Sun, 22 Mar 2020 22:01:49 +0300
Subject: [PATCH] Fix Gender column filtering (bug #4601) and correct filter
 descs

---
 CHANGELOG.md                                |   1 +
 apps/opencs/model/world/columnimp.hpp       |   2 +-
 apps/opencs/model/world/columns.cpp         |   1 -
 apps/opencs/model/world/columns.hpp         |   2 +-
 apps/opencs/model/world/refidcollection.cpp |   2 +-
 files/opencs/defaultfilters                 | Bin 10958 -> 10957 bytes
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32255262e0..75ca5c442f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
     Bug #4594: Actors without AI packages don't use Hello dialogue
     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 #4601: Filtering referenceables by gender is broken
     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 #4680: Heap corruption on faulty esp
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 25f09cb0fb..ccc18263b0 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -1770,7 +1770,7 @@ namespace CSMWorld
     struct GenderNpcColumn : public Column<ESXRecordT>
     {
         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
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index e2c3be789f..eaea66c2f9 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -288,7 +288,6 @@ namespace CSMWorld
             { ColumnId_UChar, "Value [0..255]" },
             { ColumnId_NpcMisc, "NPC Misc" },
             { ColumnId_Level, "Level" },
-            { ColumnId_GenderNpc, "Gender"},
             { ColumnId_Mana, "Mana" },
             { ColumnId_Fatigue, "Fatigue" },
             { ColumnId_NpcDisposition, "NPC Disposition" },
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 085e6e178c..c85eaac5f1 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -273,7 +273,7 @@ namespace CSMWorld
             ColumnId_UChar = 250,
             ColumnId_NpcMisc = 251,
             ColumnId_Level = 252,
-            ColumnId_GenderNpc = 254,
+            // unused
             ColumnId_Mana = 255,
             ColumnId_Fatigue = 256,
             ColumnId_NpcDisposition = 257,
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index ff146bb91a..3502d63193 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -486,7 +486,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.push_back (RefIdColumn (Columns::ColumnId_Head, ColumnBase::Display_BodyPart));
     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.mFlags.insert (std::make_pair (essential, ESM::NPC::Essential));
diff --git a/files/opencs/defaultfilters b/files/opencs/defaultfilters
index 0ac3c8db4bd939b8b9d559ab4af4056fc0b8d80e..cd46590d98f049911689d2b2eb73280655d40d7b 100644
GIT binary patch
delta 290
zcmX>XdNy<eGuvciZk5UEY%zRl3=9mx8TsW3#RaK}MVlwFg)%bEn#?FEGl`31G7m=>
zyE;U{<}8k*tc*)G8}M~9@+iSHWtOCFKE^N1#Mm?WmS6#+@?>uzmC1&RVw1Z?c_*(`
z<D5K8NP~wPrrIySdGdY*@yS1wg*Sf}iV$Gzm>i&7B`yk+Pc1G^%`3@F%uxWUES|hi
zSPZCCk<o7QK{Xv6_td<U)FLGv1tquC+{BzzB~1lQ1{c?0XCavOG_W{G@8$xP4NQ#H
elNHtVCQGX5Y9RFbBI^`@=>(Yv*0)q$lNkUtom6N5

delta 310
zcmX>bdM<PWGaKXl$rIINCM&Qd^Q$v3Fa&4hmn#GZxH<*}Z=T2&%E&l-lBCS!f1DhX
zxjDi(G@vRrXK);4Wn8*hkFS%FR~e=)vm`Zf^I?8rCdTf`*98k0l_q-#sjxA)dHRF|
zOs*D{ncOdA$jb#&?HAx&Jo$iv=;Q?)yqiA=#R*KFt|%}$PB~j%45lQtxHvVhBr`Fm
zSRt<<xmXWuRQ=?M95RzX2(eA(RN-T^nS4-9N6RfWH!&wwNk>7cq^LAiNmD_S!NoP$
wSqNrO8dx4=$mRl-4NQzRlNHtV7;Qm%H4%E#fEFP%3&1pkj0S66qOQpd0KHvXhyVZp