*Merge.

--HG--
branch : trunk

6 files changed, 42 insertions, 43 deletions

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 9650c537751..0de19314ab6 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -92,20 +92,20 @@ uint32 CreatureInfo::GetRandomValidModelId() const
     uint32 c = 0;
     uint32 modelIDs[4];
 
-    if (Modelid1) modelIDs[c++] = Modelid1;
-    if (Modelid2) modelIDs[c++] = Modelid2;
-    if (Modelid3) modelIDs[c++] = Modelid3;
-    if (Modelid4) modelIDs[c++] = Modelid4;
+    if (Modelid_A1) modelIDs[c++] = Modelid_A1;
+    if (Modelid_A2) modelIDs[c++] = Modelid_A2;
+    if (Modelid_H1) modelIDs[c++] = Modelid_H1;
+    if (Modelid_H2) modelIDs[c++] = Modelid_H2;
 
     return ((c>0) ? modelIDs[urand(0,c-1)] : 0);
 }
 
 uint32 CreatureInfo::GetFirstValidModelId() const
 {
-    if(Modelid1) return Modelid1;
-    if(Modelid2) return Modelid2;
-    if(Modelid3) return Modelid3;
-    if(Modelid4) return Modelid4;
+    if(Modelid_A1) return Modelid_A1;
+    if(Modelid_A2) return Modelid_A2;
+    if(Modelid_H1) return Modelid_H1;
+    if(Modelid_H2) return Modelid_H2;
     return 0;
 }
 
@@ -1198,8 +1198,8 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
     CreatureInfo const *cinfo = GetCreatureInfo();
     if(cinfo)
     {
-        if(displayId == cinfo->Modelid1 || displayId == cinfo->Modelid2 ||
-            displayId == cinfo->Modelid3 || displayId == cinfo->Modelid4) displayId = 0;
+        if(displayId == cinfo->Modelid_A1 || displayId == cinfo->Modelid_A2 ||
+            displayId == cinfo->Modelid_H1 || displayId == cinfo->Modelid_H2) displayId = 0;
     }
 
     // data->guid = guid don't must be update at save
diff --git a/src/game/Creature.h b/src/game/Creature.h
index 07bed9af13c..c1c1acb524c 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -159,10 +159,10 @@ struct CreatureInfo
 {
     uint32  Entry;
     uint32  HeroicEntry;
-    uint32  Modelid1;
-    uint32  Modelid2;
-    uint32  Modelid3;
-    uint32  Modelid4;
+    uint32  Modelid_A1;
+    uint32  Modelid_A2;
+    uint32  Modelid_H1;
+    uint32  Modelid_H2;
     char*   Name;
     char*   SubName;
     char*   IconName;
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 3c776b6fdfa..015bb6d3479 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -637,15 +637,15 @@ void Object::_BuildValuesUpdate(uint8 updatetype, ByteBuffer * data, UpdateMask
                     {
                         if(target->isGameMaster())
                         {
-                            if(cinfo->Modelid2)
-                                *data << cinfo->Modelid1;
+                            if(cinfo->Modelid_A2)
+                                *data << cinfo->Modelid_A1;
                             else
                                 *data << 17519; // world invisible trigger's model
                         }
                         else
                         {
-                            if(cinfo->Modelid2)
-                                *data << cinfo->Modelid2;
+                            if(cinfo->Modelid_A2)
+                                *data << cinfo->Modelid_A2;
                             else
                                 *data << 11686; // world invisible trigger's model
                         }
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index d3a9fe23395..3351b001e5b 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -616,25 +616,25 @@ void ObjectMgr::LoadCreatureTemplates()
             sLog.outErrorDb("Creature (Entry: %u) has non-existing faction_H template (%u)", cInfo->Entry, cInfo->faction_H);
 
         // check model ids, supplying and sending non-existent ids to the client might crash them
-        if(cInfo->Modelid1 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid1))
+        if(cInfo->Modelid_A1 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid_A1))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing modelId_A (%u), setting it to 0", cInfo->Entry, cInfo->Modelid1);
-            const_cast<CreatureInfo*>(cInfo)->Modelid1 = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing Modelid_A1 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid_A1);
+            const_cast<CreatureInfo*>(cInfo)->Modelid_A1 = 0;
         }
-        if(cInfo->Modelid2 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid2))
+        if(cInfo->Modelid_A2 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid_A2))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing modelId_A2 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid2);
-            const_cast<CreatureInfo*>(cInfo)->Modelid2 = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing Modelid_A2 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid_A2);
+            const_cast<CreatureInfo*>(cInfo)->Modelid_A2 = 0;
         }
-        if(cInfo->Modelid3 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid3))
+        if(cInfo->Modelid_H1 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid_H1))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing modelId_H (%u), setting it to 0", cInfo->Entry, cInfo->Modelid3);
-            const_cast<CreatureInfo*>(cInfo)->Modelid3 = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing Modelid_H1 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid_H1);
+            const_cast<CreatureInfo*>(cInfo)->Modelid_H1 = 0;
         }
-        if(cInfo->Modelid4 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid4))
+        if(cInfo->Modelid_H2 && !sCreatureModelStorage.LookupEntry<CreatureModelInfo>(cInfo->Modelid_H2))
         {
-            sLog.outErrorDb("Creature (Entry: %u) has non-existing modelId_H2 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid4);
-            const_cast<CreatureInfo*>(cInfo)->Modelid4 = 0;
+            sLog.outErrorDb("Creature (Entry: %u) has non-existing Modelid_H2 (%u), setting it to 0", cInfo->Entry, cInfo->Modelid_H2);
+            const_cast<CreatureInfo*>(cInfo)->Modelid_H2 = 0;
         }
 
         if(cInfo->dmgschool >= MAX_SPELL_SCHOOL)
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index b27620e7857..2a4e08cf0d9 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -186,11 +186,10 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data )
         data << uint32(ci->family);                         // family         wdbFeild9
         data << uint32(ci->rank);                           // rank           wdbFeild10
         data << uint32(ci->PetSpellDataId);                 // Id from CreatureSpellData.dbc    wdbField12
-        data << uint32(ci->Modelid1);                       // modelid_male1
-        data << uint32(ci->Modelid2);                       // modelid_female1 ?
-        data << uint32(ci->Modelid3);                       // modelid_male2 ?
-        data << uint32(ci->Modelid4);                       // modelid_femmale2 ?
-        data << float(ci->unk16);                           // unk
+        data << (uint32)ci->Modelid_A1;                     // Modelid_A1
+        data << (uint32)ci->Modelid_A2;                     // Modelid_A2
+        data << (uint32)ci->Modelid_H1;                     // Modelid_H1
+        data << (uint32)ci->Modelid_H2;                     // Modelid_H2
         data << float(ci->unk17);                           // unk
         data << uint8(ci->RacialLeader);
         SendPacket( &data );
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index 3b1879feca7..6969960e7ea 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -61,17 +61,17 @@ void Totem::Summon(Unit* owner)
         uint32 modelid = 0;
         if(((Player*)owner)->GetTeam() == HORDE)
         {
-            if(cinfo->Modelid3)
-                modelid = cinfo->Modelid3;
-            else if(cinfo->Modelid4)
-                modelid = cinfo->Modelid4;
+            if(cinfo->Modelid_H1)
+                modelid = cinfo->Modelid_H1;
+            else if(cinfo->Modelid_H2)
+                modelid = cinfo->Modelid_H2;
         }
         else
         {
-            if(cinfo->Modelid1)
-                modelid = cinfo->Modelid1;
-            else if(cinfo->Modelid2)
-                modelid = cinfo->Modelid2;
+            if(cinfo->Modelid_A1)
+                modelid = cinfo->Modelid_A1;
+            else if(cinfo->Modelid_A2)
+                modelid = cinfo->Modelid_A2;
         }
         if (modelid)
             SetDisplayId(modelid);