Merge pull request #1774 from plenarius/fix-exit-detect-event

Events: Fixed DETECT_ENTER firing when should be DETECT_EXIT
nwnxee · Sep 13, 2024 · e560c10 · e560c10
2 parents 0880a3b + 2ee0c1b
commit e560c10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,7 @@ https://github.com/nwnxee/unified/compare/build8193.36.12...HEAD
 ### Fixed
 - Race: Documentation updated as `NWNX_Utils` is no longer required with introduction of native `Get2DARowCount()`.
 - Core README indicated wrong argument for logging. `NWNX_CORE_LOG_FILE_NAME` should have been `NWNX_CORE_LOG_FILE_PATH`.
+- Events: Fixed `NWNX_ON_DETECT_ENTER_*` events firing when it should have been `NWNX_ON_DETECT_EXIT_*`.
 
 ## 8193.36.10
 https://github.com/nwnxee/unified/compare/build8193.36.9...build8193.36.10

diff --git a/Plugins/Events/Events/StealthEvents.cpp b/Plugins/Events/Events/StealthEvents.cpp
@@ -121,7 +121,7 @@ void SetDetectModeHook(CNWSCreature* thisPtr, uint8_t nDetectMode)
     }
     else if(currentlyDetecting && !willBeDetecting)
     {
-        if (SignalEvent("NWNX_ON_DETECT_ENTER_BEFORE", thisPtr->m_idSelf))
+        if (SignalEvent("NWNX_ON_DETECT_EXIT_BEFORE", thisPtr->m_idSelf))
         {
             s_SetDetectModeHook->CallOriginal<void>(thisPtr, nDetectMode);
         }
@@ -130,7 +130,7 @@ void SetDetectModeHook(CNWSCreature* thisPtr, uint8_t nDetectMode)
             thisPtr->SetActivity(0, true);
         }
 
-        SignalEvent("NWNX_ON_DETECT_ENTER_AFTER", thisPtr->m_idSelf);
+        SignalEvent("NWNX_ON_DETECT_EXIT_AFTER", thisPtr->m_idSelf);
     }
 }