[12683] Implement CreatureLinking Flag DESPAWN_ON_DESPAWN

Thanks to grz3s for testing and feedback.

src/game/Creature.cpp

@@ -212,6 +212,9 @@ void Creature::RemoveCorpse()
     if (AI())
         AI()->CorpseRemoved(respawnDelay);
 
+    if (m_isCreatureLinkingTrigger)
+        GetMap()->GetCreatureLinkingHolder()->DoCreatureLinkingEvent(LINKING_EVENT_DESPAWN, this);
+
     // script can set time (in seconds) explicit, override the original
     if (respawnDelay)
         m_respawnTime = time(NULL) + respawnDelay;

src/game/CreatureLinkingMgr.cpp

@@ -262,6 +262,7 @@ enum EventMask
     EVENT_MASK_ON_DIE       = FLAG_DESPAWN_ON_DEATH | FLAG_SELFKILL_ON_DEATH | FLAG_RESPAWN_ON_DEATH | FLAG_FOLLOW,
     EVENT_MASK_ON_RESPAWN   = FLAG_RESPAWN_ON_RESPAWN | FLAG_DESPAWN_ON_RESPAWN | FLAG_FOLLOW,
     EVENT_MASK_TRIGGER_TO   = FLAG_TO_AGGRO_ON_AGGRO | FLAG_TO_RESPAWN_ON_EVADE | FLAG_FOLLOW,
+    EVENT_MASK_ON_DESPAWN   = FLAG_DESPAWN_ON_DESPAWN,
 };
 
 // This functions checks if the NPC has linked NPCs for dynamic action
@@ -414,6 +415,7 @@ void CreatureLinkingHolder::DoCreatureLinkingEvent(CreatureLinkingEvent eventTyp
         case LINKING_EVENT_EVADE:   eventFlagFilter = EVENT_MASK_ON_EVADE;   reverseEventFlagFilter = FLAG_TO_RESPAWN_ON_EVADE; break;
         case LINKING_EVENT_DIE:     eventFlagFilter = EVENT_MASK_ON_DIE;     reverseEventFlagFilter = 0;                        break;
         case LINKING_EVENT_RESPAWN: eventFlagFilter = EVENT_MASK_ON_RESPAWN; reverseEventFlagFilter = FLAG_FOLLOW;              break;
+        case LINKING_EVENT_DESPAWN: eventFlagFilter = EVENT_MASK_ON_DESPAWN; reverseEventFlagFilter = 0;                        break;
     }
 
     // Process Slaves (by entry)
@@ -471,6 +473,7 @@ void CreatureLinkingHolder::DoCreatureLinkingEvent(CreatureLinkingEvent eventTyp
                             SetFollowing(pSource, pMaster);
                         break;
                     case LINKING_EVENT_DIE:                 // Nothing linked for this case
+                    case LINKING_EVENT_DESPAWN:             // Nothing linked for this case
                         break;
                 }
             }
@@ -550,6 +553,11 @@ void CreatureLinkingHolder::ProcessSlave(CreatureLinkingEvent eventType, Creatur
             if (flag & FLAG_FOLLOW && pSlave->isAlive() && !pSlave->isInCombat())
                 SetFollowing(pSlave, pSource);
 
+            break;
+        case LINKING_EVENT_DESPAWN:
+            if (flag & FLAG_DESPAWN_ON_DESPAWN && !pSlave->IsDespawned())
+                pSlave->ForcedDespawn();
+
             break;
     }
 }

src/game/CreatureLinkingMgr.h

@@ -50,6 +50,7 @@ enum CreatureLinkingEvent
     LINKING_EVENT_EVADE         = 1,
     LINKING_EVENT_DIE           = 2,
     LINKING_EVENT_RESPAWN       = 3,
+    LINKING_EVENT_DESPAWN       = 4,
 };
 
 // enum describing possible flags action flags for NPCs linked to other NPCs
@@ -71,12 +72,13 @@ enum CreatureLinkingFlags
 
     // Dynamic behaviour, out of combat
     FLAG_FOLLOW                     = 0x0200,
+    FLAG_DESPAWN_ON_DESPAWN         = 0x2000,
 
     // Passive behaviour
     FLAG_CANT_SPAWN_IF_BOSS_DEAD    = 0x0400,
     FLAG_CANT_SPAWN_IF_BOSS_ALIVE   = 0x0800,
 
-    LINKING_FLAG_INVALID            = 0x2000,               // TODO adjust when other flags are implemented
+    LINKING_FLAG_INVALID            = 0x4000,               // TODO adjust when other flags are implemented
 };
 
 // Structure holding the information for an entry

src/shared/revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12682"
+ #define REVISION_NR "12683"
 #endif // __REVISION_NR_H__