Merge commit 'origin/master' into 330

This commit is contained in:
tomrus88 2009-10-17 02:53:46 +04:00
commit dd9fd414bb
42 changed files with 1073 additions and 728 deletions

View file

@ -257,7 +257,7 @@ void Object::_BuildMovementUpdate(ByteBuffer * data, uint16 flags, uint32 flags2
{
case TYPEID_UNIT:
{
flags2 = ((Unit*)this)->isInFlight() ? (MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_LEVITATING) : MOVEMENTFLAG_NONE;
flags2 = ((Creature*)this)->canFly() ? (MOVEMENTFLAG_FORWARD | MOVEMENTFLAG_LEVITATING) : MOVEMENTFLAG_NONE;
}
break;
case TYPEID_PLAYER: