Auto close death dialog if local player resurrected.

1 files changed, 10 insertions, 1 deletions

diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index cb02e690e..d9e058955 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -33,6 +33,7 @@
 
 #include "input/keyboardconfig.h"
 
+#include "gui/windows/okdialog.h"
 #include "gui/windows/outfitwindow.h"
 #include "gui/windows/socialwindow.h"
 
@@ -55,6 +56,8 @@
 
 #include "debug.h"
 
+extern OkDialog *deathNotice;
+
 namespace TmwAthena
 {
 
@@ -1253,7 +1256,7 @@ void BeingRecv::processPlayerStatusChange(Net::MessageIn &msg)
 void BeingRecv::processBeingResurrect(Net::MessageIn &msg)
 {
     BLOCK_START("BeingRecv::processBeingResurrect")
-    if ((actorManager == nullptr) || (localPlayer == nullptr))
+    if (actorManager == nullptr || localPlayer == nullptr)
     {
         BLOCK_END("BeingRecv::processBeingResurrect")
         return;
@@ -1274,6 +1277,12 @@ void BeingRecv::processBeingResurrect(Net::MessageIn &msg)
     // If this is player's current target, clear it.
     if (dstBeing == localPlayer->getTarget())
         localPlayer->stopAttack();
+    if (dstBeing == localPlayer &&
+        deathNotice != nullptr)
+    {
+        deathNotice->scheduleDelete();
+        deathNotice = nullptr;
+    }
 
     if (msg.readInt16("flag?") == 1)
         dstBeing->setAction(BeingAction::STAND, 0);