[8008] Fixed SMSG_RAID_INSTANCE_MESSAGE opcode. Author: tomrus88

--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-14 10:06:41 -05:00
parent 85a50c7ce2
commit 314a4f8f00
3 changed files with 9 additions and 15 deletions
+7 -1
View File
@@ -18796,10 +18796,16 @@ void Player::SendInstanceResetWarning(uint32 mapid, uint32 time)
type = RAID_INSTANCE_WARNING_MIN; type = RAID_INSTANCE_WARNING_MIN;
else else
type = RAID_INSTANCE_WARNING_MIN_SOON; 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(type);
data << uint32(mapid); data << uint32(mapid);
data << uint32(0); // may be difficulty
data << uint32(time); data << uint32(time);
if(type == RAID_INSTANCE_WELCOME)
{
data << uint8(0);
data << uint8(0);
}
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
} }
+2 -1
View File
@@ -685,7 +685,8 @@ enum InstanceResetWarningType
RAID_INSTANCE_WARNING_HOURS = 1, // WARNING! %s is scheduled to reset in %d hour(s). 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 = 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_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
}; };
// flags that use in movement check for example at spell casting // flags that use in movement check for example at spell casting
-13
View File
@@ -31,19 +31,6 @@ class Aura;
enum SpellCastTargetFlags 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_SELF = 0x00000000,
TARGET_FLAG_UNUSED1 = 0x00000001, // not used in any spells as of 3.0.3 (can be set dynamically) TARGET_FLAG_UNUSED1 = 0x00000001, // not used in any spells as of 3.0.3 (can be set dynamically)
TARGET_FLAG_UNIT = 0x00000002, // pguid TARGET_FLAG_UNIT = 0x00000002, // pguid