*Always remove riding aura when exit vehicle.

*Other misc changes.

--HG--
branch : trunk

1 files changed, 14 insertions, 1 deletions

diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 084c7fe0b8d..f1bef6c6808 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -1027,7 +1027,20 @@ uint32 ObjectMgr::ChooseDisplayId(uint32 team, const CreatureInfo *cinfo, const
         return data->displayid;
 
     if(!team)
-        return cinfo->GetRandomValidModelId();
+    {
+        switch(cinfo->Entry)
+        {
+            case 28511: // Eye of Acherus
+            case 33114: // Flame Leviathan Seat (model 24914 chair)
+            case 33167: // Salvaged Demolisher Mechanic Seat
+            case 33218: // Pyrite Safety Container
+                return cinfo->DisplayID_A[0];
+            case 33143: // Overload Control Device
+                return cinfo->DisplayID_H[0];
+            default:
+                return cinfo->GetRandomValidModelId();
+        }
+    }
 
     // use defaults from the template
     uint32 display_id;