From fb9f4acf4be59ccc5b6cd678119945a5db9a2a54 Mon Sep 17 00:00:00 2001
From: tomrus88 <tomrus88@gmail.com>
Date: Sun, 14 Jun 2009 13:59:07 +0400
Subject: [PATCH] [8008] Fixed SMSG_RAID_INSTANCE_MESSAGE opcode.

---
 src/game/Player.cpp      |  8 +++++++-
 src/game/Player.h        |  3 ++-
 src/game/Spell.h         | 13 -------------
 src/shared/revision_nr.h |  2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 78faf4e08..a2f166a8e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -18078,10 +18078,16 @@ void Player::SendInstanceResetWarning(uint32 mapid, uint32 time)
         type = RAID_INSTANCE_WARNING_MIN;
     else
         type = RAID_INSTANCE_WARNING_MIN_SOON;
-    WorldPacket data(SMSG_RAID_INSTANCE_MESSAGE, 4+4+4);
+    WorldPacket data(SMSG_RAID_INSTANCE_MESSAGE, 4+4+4+4);
     data << uint32(type);
     data << uint32(mapid);
+    data << uint32(0);                                      // may be difficulty
     data << uint32(time);
+    if(type == RAID_INSTANCE_WELCOME)
+    {
+        data << uint8(0);
+        data << uint8(0);
+    }
     GetSession()->SendPacket(&data);
 }
 
diff --git a/src/game/Player.h b/src/game/Player.h
index cf31c419e..ac0853d8d 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -684,7 +684,8 @@ enum InstanceResetWarningType
     RAID_INSTANCE_WARNING_HOURS     = 1,                    // WARNING! %s is scheduled to reset in %d hour(s).
     RAID_INSTANCE_WARNING_MIN       = 2,                    // WARNING! %s is scheduled to reset in %d minute(s)!
     RAID_INSTANCE_WARNING_MIN_SOON  = 3,                    // WARNING! %s is scheduled to reset in %d minute(s). Please exit the zone or you will be returned to your bind location!
-    RAID_INSTANCE_WELCOME           = 4                     // Welcome to %s. This raid instance is scheduled to reset in %s.
+    RAID_INSTANCE_WELCOME           = 4,                    // Welcome to %s. This raid instance is scheduled to reset in %s.
+    RAID_INSTANCE_EXPIRED           = 5
 };
 
 struct MovementInfo
diff --git a/src/game/Spell.h b/src/game/Spell.h
index f15a35af9..90c8983dc 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -32,19 +32,6 @@ class Aura;
 
 enum SpellCastTargetFlags
 {
-    /*TARGET_FLAG_NONE             = 0x0000,
-    TARGET_FLAG_SWIMMER          = 0x0002,
-    TARGET_FLAG_ITEM             = 0x0010,
-    TARGET_FLAG_SOURCE_AREA      = 0x0020,
-    TARGET_FLAG_DEST_AREA        = 0x0040,
-    TARGET_FLAG_UNKNOWN          = 0x0080,
-    TARGET_FLAG_SELF             = 0x0100,
-    TARGET_FLAG_PVP_CORPSE       = 0x0200,
-    TARGET_FLAG_MASS_SPIRIT_HEAL = 0x0400,
-    TARGET_FLAG_BEAST_CORPSE     = 0x0402,
-    TARGET_FLAG_OBJECT           = 0x4000,
-    TARGET_FLAG_RESURRECTABLE    = 0x8000*/
-
     TARGET_FLAG_SELF            = 0x00000000,
     TARGET_FLAG_UNUSED1         = 0x00000001,               // not used in any spells as of 3.0.3 (can be set dynamically)
     TARGET_FLAG_UNIT            = 0x00000002,               // pguid
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 24ad45ee5..52be6cdd8 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8007"
+ #define REVISION_NR "8008"
 #endif // __REVISION_NR_H__
-- 
2.11.4.GIT