Core/Creatures: Dismount creatures without CREATURE_TYPEFLAGS_MOUNTED_COMBAT when entering combat

This commit is contained in:
Shauren
2011-04-18 11:43:50 +02:00
parent 721f2f999e
commit 0d477ab132
2 changed files with 4 additions and 1 deletions
+3
View File
@@ -11892,6 +11892,9 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
UpdateSpeed(MOVE_SWIM, true); UpdateSpeed(MOVE_SWIM, true);
UpdateSpeed(MOVE_FLIGHT, true); UpdateSpeed(MOVE_FLIGHT, true);
} }
if (!(ToCreature()->GetCreatureInfo()->type_flags & CREATURE_TYPEFLAGS_MOUNTED_COMBAT))
Unmount();
} }
for (Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr) for (Unit::ControlList::iterator itr = m_Controlled.begin(); itr != m_Controlled.end(); ++itr)
@@ -2158,7 +2158,7 @@ enum CreatureTypeFlags
CREATURE_TYPEFLAGS_HERBLOOT = 0x000100, // Can be looted by herbalist CREATURE_TYPEFLAGS_HERBLOOT = 0x000100, // Can be looted by herbalist
CREATURE_TYPEFLAGS_MININGLOOT = 0x000200, // Can be looted by miner CREATURE_TYPEFLAGS_MININGLOOT = 0x000200, // Can be looted by miner
CREATURE_TYPEFLAGS_UNK11 = 0x000400, CREATURE_TYPEFLAGS_UNK11 = 0x000400,
CREATURE_TYPEFLAGS_UNK12 = 0x000800, // ? Related to mounts in some way. If mounted, fight mounted, mount appear as independant when rider dies? CREATURE_TYPEFLAGS_MOUNTED_COMBAT = 0x000800, // Creature can remain mounted when entering combat
CREATURE_TYPEFLAGS_AID_PLAYERS = 0x001000, // ? Can aid any player in combat if in range? CREATURE_TYPEFLAGS_AID_PLAYERS = 0x001000, // ? Can aid any player in combat if in range?
CREATURE_TYPEFLAGS_UNK14 = 0x002000, CREATURE_TYPEFLAGS_UNK14 = 0x002000,
CREATURE_TYPEFLAGS_UNK15 = 0x004000, // ? Possibly not in use CREATURE_TYPEFLAGS_UNK15 = 0x004000, // ? Possibly not in use