Core/InstanceScript: Encounterframe research - extended the EncounterFrameType enum

2 files changed, 16 insertions, 10 deletions

diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp
index c6a93ff4272..6b0431aae83 100755
--- a/src/server/game/Instances/InstanceScript.cpp
+++ b/src/server/game/Instances/InstanceScript.cpp
@@ -397,22 +397,22 @@ void InstanceScript::SendEncounterUnit(uint32 type, Unit* unit /*= NULL*/, uint8
 
     switch (type)
     {
-        case ENCOUNTER_FRAME_ADD:
-        case ENCOUNTER_FRAME_REMOVE:
-        case 2:
+        case ENCOUNTER_FRAME_ENGAGE:
+        case ENCOUNTER_FRAME_DISENGAGE:
+        case ENCOUNTER_FRAME_UPDATE_PRIORITY:
             data.append(unit->GetPackGUID());
             data << uint8(param1);
             break;
-        case 3:
-        case 4:
-        case 6:
+        case ENCOUNTER_FRAME_ADD_TIMER:
+        case ENCOUNTER_FRAME_ENABLE_OBJECTIVE:
+        case ENCOUNTER_FRAME_DISABLE_OBJECTIVE:
             data << uint8(param1);
             data << uint8(param2);
             break;
-        case 5:
+        case ENCOUNTER_FRAME_UPDATE_OBJECTIVE:
             data << uint8(param1);
             break;
-        case 7:
+        case ENCOUNTER_FRAME_UNK7:
         default:
             break;
     }
diff --git a/src/server/game/Instances/InstanceScript.h b/src/server/game/Instances/InstanceScript.h
index 69f11c203c1..71f1572624b 100755
--- a/src/server/game/Instances/InstanceScript.h
+++ b/src/server/game/Instances/InstanceScript.h
@@ -42,8 +42,14 @@ typedef std::set<Creature*> MinionSet;
 
 enum EncounterFrameType
 {
-    ENCOUNTER_FRAME_ADD     = 0,
-    ENCOUNTER_FRAME_REMOVE  = 1,
+    ENCOUNTER_FRAME_ENGAGE              = 0,
+    ENCOUNTER_FRAME_DISENGAGE           = 1,
+    ENCOUNTER_FRAME_UPDATE_PRIORITY     = 2,
+    ENCOUNTER_FRAME_ADD_TIMER           = 3,
+    ENCOUNTER_FRAME_ENABLE_OBJECTIVE    = 4,
+    ENCOUNTER_FRAME_UPDATE_OBJECTIVE    = 5,
+    ENCOUNTER_FRAME_DISABLE_OBJECTIVE   = 6,
+    ENCOUNTER_FRAME_UNK7                = 7,    // Seems to have something to do with sorting the encounter units
 };
 
 enum EncounterState