Merge pull request #1695 from summonFox/Fix-reveal-plugin-revealing-a…

…ll-PCs Reveal: Fix Reveal plugin always revealing PCs when the plugin is enabled, regardless of usage.
nwnxee · Aug 26, 2023 · bb55146 · bb55146
2 parents 0c277c9 + da43754
commit bb55146
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,7 @@ https://github.com/nwnxee/unified/compare/build8193.35.40...HEAD
 
 ### Fixed
 - Experimental: PlayerHitpointsAsPercentage: added the new argument nMessageLimit to SendServerToPlayerGameObjUpdate hook
+- Reveal: Fixed Reveal plugin always revealing all PCs regardless of plugin usage.
 
 ## 8193.35.40
 https://github.com/nwnxee/unified/compare/build8193.35.37...build8193.35.40

diff --git a/Plugins/Reveal/Reveal.cpp b/Plugins/Reveal/Reveal.cpp
@@ -46,37 +46,45 @@ Reveal::Reveal(Services::ProxyServiceList* services)
 Reveal::~Reveal()
 {
 }
-int32_t Reveal::HookStealthDetection(CNWSCreature* pObserverCreature, CNWSCreature* pHidingCreature, int32_t bClearLOS, int32_t* bSeen, int32_t* bHeard, int32_t bTargetInvisible)
+BOOL Reveal::HookStealthDetection(CNWSCreature* pObserverCreature, CNWSCreature* pHidingCreature, BOOL bClearLOS, BOOL* bSeen, BOOL* bHeard, BOOL bTargetHiding)
 {
     if (pObserverCreature->m_bPlayerCharacter && pHidingCreature->m_bPlayerCharacter && pHidingCreature->m_nStealthMode)
     {
         if (pObserverCreature->GetArea() == pHidingCreature->GetArea())
         {
-            if (*pHidingCreature->nwnxGet<int>(revealKey + "PARTY"))
+            auto partyReveal = pHidingCreature->nwnxGet<int>(revealKey + "PARTY");
+            if (partyReveal && *partyReveal)
             {
                 if (pObserverCreature->GetFaction()->GetLeader() == pHidingCreature->GetFaction()->GetLeader())
                 {
-                    if(*pHidingCreature->nwnxGet<int>(detectionKey + "PARTY"))
-                    {
-                        *bSeen = true;
-                    }
+                    auto detectionVector = pHidingCreature->nwnxGet<int>(detectionKey + "PARTY");
+                    if (detectionVector && *detectionVector)
+                        *bSeen = *detectionVector;
+                    else
+                        *bSeen = false;
+
                     *bHeard = true;
                     return true;
                 }
             }
-            if (*pHidingCreature->nwnxGet<int>(revealKey + Utils::ObjectIDToString(pObserverCreature->m_idSelf)))
+
+            auto reveal = pHidingCreature->nwnxGet<int>(revealKey + Utils::ObjectIDToString(pObserverCreature->m_idSelf));
+            if (reveal && *reveal)
             {
                 pHidingCreature->nwnxRemove(revealKey + Utils::ObjectIDToString(pObserverCreature->m_idSelf)); //remove mapping after first check
-                if (*pHidingCreature->nwnxGet<int>(detectionKey + Utils::ObjectIDToString(pObserverCreature->m_idSelf)))
-                {
-                    *bSeen = true;
-                }
+
+                auto detectionVector = pHidingCreature->nwnxGet<int>(detectionKey + Utils::ObjectIDToString(pObserverCreature->m_idSelf));
+                if (detectionVector && *detectionVector)
+                    *bSeen = *detectionVector;
+                else
+                    *bSeen = false;
+
                 *bHeard = true;
                 return true;
             }
         }
     }
-    return g_plugin->m_DoStealthDetection->CallOriginal<int32_t>(pObserverCreature, pHidingCreature, bClearLOS, bSeen, bHeard, bTargetInvisible);
+    return g_plugin->m_DoStealthDetection->CallOriginal<BOOL>(pObserverCreature, pHidingCreature, bClearLOS, bSeen, bHeard, bTargetHiding);
 }
 
 

diff --git a/Plugins/Reveal/Reveal.hpp b/Plugins/Reveal/Reveal.hpp
@@ -14,7 +14,7 @@ class Reveal : public NWNXLib::Plugin
 private:
     NWNXLib::Hooks::Hook m_DoStealthDetection;
 
-    static int32_t HookStealthDetection(CNWSCreature* thisCreature, CNWSCreature* pHidingCreature, int32_t bClearLOS, int32_t* bSeen, int32_t* bHeard, int32_t bTargetInvisible);
+    static BOOL HookStealthDetection(CNWSCreature* thisCreature, CNWSCreature* pHidingCreature, BOOL bClearLOS, BOOL* bSeen, BOOL* bHeard, BOOL bTargetHiding);
 
     ArgumentStack RevealTo(ArgumentStack&& args);
     ArgumentStack SetRevealToParty(ArgumentStack&& args);