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/Object.cpp b/src/game/Object.cpp
index b2e3486a210..c13a41d9d8c 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -578,15 +578,15 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
                         {
                             if(target->isGameMaster())
                             {
-                                if(cinfo->DisplayID_A[0])
-                                    *data << cinfo->DisplayID_A[0];
+                                if(cinfo->Modelid1)
+                                    *data << cinfo->Modelid1;
                                 else
                                     *data << 17519; // world invisible trigger's model
                             }
                             else
                             {
-                                if(cinfo->DisplayID_A[1])
-                                    *data << cinfo->DisplayID_A[1];
+                                if(cinfo->Modelid3)
+                                    *data << cinfo->Modelid3;
                                 else
                                     *data << 11686; // world invisible trigger's model
                             }