From 5b5e266c17f29b75fdf4705de3ba7c1264748d21 Mon Sep 17 00:00:00 2001
From: tomrus88 <tomrus88@gmail.com>
Date: Sat, 22 Nov 2008 09:04:10 +0300
Subject: [PATCH] Misc fixes

---
 src/game/Player.cpp      |  4 ++++
 src/game/SharedDefines.h |  2 +-
 src/game/SpellAuras.cpp  |  2 +-
 src/game/Unit.h          | 16 ++++++++--------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 90d96ec28..640898df1 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -7968,6 +7968,10 @@ uint8 Player::FindEquipSlot( ItemPrototype const* proto, uint32 slot, bool swap
                     if (pClass == CLASS_WARLOCK)
                         slots[0] = EQUIPMENT_SLOT_RANGED;
                     break;
+                case ITEM_SUBCLASS_ARMOR_SIGIL:
+                    if (pClass == CLASS_DEATH_KNIGHT)
+                        slots[0] = EQUIPMENT_SLOT_RANGED;
+                    break;
             }
             break;
         }
diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index 14072c790..38fc9b959 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -1555,7 +1555,7 @@ enum CreatureFamily
 
 enum CreatureTypeFlags
 {
-    CREATURE_TYPEFLAGS_TAMEBLE    = 0x0001,
+    CREATURE_TYPEFLAGS_TAMEABLE   = 0x0001,
     CREATURE_TYPEFLAGS_HERBLOOT   = 0x0100,
     CREATURE_TYPEFLAGS_MININGLOOT = 0x0200
 };
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 344ce5afb..64c6afaf0 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -3017,7 +3017,7 @@ void Aura::HandleModPossessPet(bool apply, bool Real)
     {
         pet->AttackStop();
         pet->GetMotionMaster()->MoveFollow(caster, PET_FOLLOW_DIST, PET_FOLLOW_ANGLE);
-        pet->SetUnitMovementFlags(MOVEMENTFLAG_WALK_MODE);
+        pet->SetUnitMovementFlags(MOVEMENTFLAG_NONE);
     }
 }
 
diff --git a/src/game/Unit.h b/src/game/Unit.h
index a25bef2f3..3b585b4f3 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -163,14 +163,14 @@ enum SheathState
 // byte (1 from 0..3) of UNIT_FIELD_BYTES_2
 enum UnitBytes2_Flags
 {
-    UNIT_BYTE2_FLAG_PVP     = 0x01,
-    UNIT_BYTE2_FLAG_UNK1    = 0x02,
-    UNIT_BYTE2_FLAG_FFA_PVP = 0x04,
-    UNIT_BYTE2_FLAG_UNK3    = 0x08,
-    UNIT_BYTE2_FLAG_AURAS   = 0x10,                         // show possitive auras as positive, and allow its dispel
-    UNIT_BYTE2_FLAG_UNK5    = 0x20,
-    UNIT_BYTE2_FLAG_UNK6    = 0x40,
-    UNIT_BYTE2_FLAG_UNK7    = 0x80
+    UNIT_BYTE2_FLAG_PVP         = 0x01,
+    UNIT_BYTE2_FLAG_UNK1        = 0x02,
+    UNIT_BYTE2_FLAG_FFA_PVP     = 0x04,
+    UNIT_BYTE2_FLAG_SANCTUARY   = 0x08,
+    UNIT_BYTE2_FLAG_AURAS       = 0x10,                     // show positive auras as positive, and allow its dispel
+    UNIT_BYTE2_FLAG_UNK5        = 0x20,
+    UNIT_BYTE2_FLAG_UNK6        = 0x40,
+    UNIT_BYTE2_FLAG_UNK7        = 0x80
 };
 
 // byte (2 from 0..3) of UNIT_FIELD_BYTES_2