Tweaks: add NWNX_TWEAKS_FIX_DM_FACTION_BUG

Author: Daztek

CHANGELOG.md

@@ -10,6 +10,7 @@ https://github.com/nwnxee/unified/compare/build8193.33...HEAD
 ### Added
 - Tweaks: added `NWNX_TWEAKS_HIDE_HARDCODED_ITEM_VFX` to hide various hardcoded item vfx.
 - Tweaks: added `NWNX_TWEAKS_FIX_RESMAN_MEMLEAK` that fixes a memory leak in Resman / CResGFF.
+- Tweaks: added `NWNX_TWEAKS_FIX_DM_FACTION_BUG` that fixes a DM faction bug when using a non-DMClient BIC file.
 
 ##### New Plugins
 - N/A

Plugins/Tweaks/CMakeLists.txt

@@ -11,6 +11,7 @@ add_plugin(Tweaks
     "DisplayNumAttacksOverrideInCharacterSheet.cpp"
     "FixArmorDexBonusUnderOne.cpp"
     "FixDispelEffectLevels.cpp"
+    "FixDMFactionBug.cpp"
     "FixGreaterSanctuaryBug.cpp"
     "FixItemNullptrInCItemRepository.cpp"
     "FixResmanMemleak.cpp"

Plugins/Tweaks/FixDMFactionBug.cpp

@@ -0,0 +1,29 @@
+#include "nwnx.hpp"
+
+#include "API/CNWSCreature.hpp"
+#include "API/CNWSCreatureStats.hpp"
+
+
+namespace Tweaks {
+
+using namespace NWNXLib;
+using namespace NWNXLib::API;
+
+
+void FixDMFactionBug() __attribute__((constructor));
+void FixDMFactionBug()
+{
+    if (!Config::Get<bool>("FIX_DM_FACTION_BUG", false))
+        return;
+
+    LOG_INFO("Fixing a DM faction bug when using a non-DMClient BIC file.");
+
+    static Hooks::Hook s_PostProcessHook = Hooks::HookFunction(Functions::_ZN12CNWSCreature11PostProcessEv,
+    (void*)+[](CNWSCreature *thisPtr) -> void
+    {
+        thisPtr->m_bPlayerCharacter = thisPtr->m_pStats->m_bIsPC;
+        s_PostProcessHook->CallOriginal<void>(thisPtr);
+    }, Hooks::Order::Early);
+}
+
+}

Plugins/Tweaks/README.md

@@ -41,7 +41,8 @@ Tweaks stuff. See below.
 | `NWNX_TWEAKS_MATERIAL_NAME_NULL_IS_ALL` | true or false | Makes SetMaterialShaderParamXxx() functions take `sMaterial=""` to mean all materials. |
 | `NWNX_TWEAKS_SUMMON_ASSOCIATE_USE_COMPUTE_SAFE_LOCATION` | true or false | CNWSCreature::SummonAssociate() will use ComputeSafeLocation() instead of ComputeNonVisibleLocation() |
 | `NWNX_TWEAKS_HIDE_HARDCODED_ITEM_VFX` | int | See [here](https://github.com/nwnxee/unified/tree/master/Plugins/Tweaks#nwnx_tweaks_hide_hardcoded_item_vfx). |
-| `NWNX_TWEAKS_FIX_RESMAN_MEMLEAK` | true or false | Fix a memory leak in Resman / CResGFF |
+| `NWNX_TWEAKS_FIX_RESMAN_MEMLEAK` | true or false | Fixes a memory leak in Resman / CResGFF |
+| `NWNX_TWEAKS_FIX_DM_FACTION_BUG` | true or false | Fixes a DM faction bug when using a non-DMClient BIC file. |
 
 ## Environment variable values