Reapply patch about changing modelid_a/h(2) values to modelid1..4, display ids are no longer incorrectly chosen based on player faction.

--HG--
branch : trunk

1 files changed, 4 insertions, 4 deletions

diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index 860427e787e..ebd5e773c12 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -190,10 +190,10 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
         data << uint32(ci->rank);                           // Creature Rank (elite, boss, etc)
         data << uint32(ci->KillCredit[0]);                  // new in 3.1, kill credit
         data << uint32(ci->KillCredit[1]);                  // new in 3.1, kill credit
-        data << uint32(ci->DisplayID_A[0]);                 // modelid_male1
-        data << uint32(ci->DisplayID_H[0]);                 // modelid_female1 ?
-        data << uint32(ci->DisplayID_A[1]);                 // modelid_male2 ?
-        data << uint32(ci->DisplayID_H[1]);                 // modelid_femmale2 ?
+        data << uint32(ci->Modelid1);                       // Modelid1
+        data << uint32(ci->Modelid2);                       // Modelid2
+        data << uint32(ci->Modelid3);                       // Modelid3
+        data << uint32(ci->Modelid4);                       // Modelid4
         data << float(ci->unk16);                           // unk
         data << float(ci->unk17);                           // unk
         data << uint8(ci->RacialLeader);