diff options
| author | Anubisss <none@none> | 2009-04-16 00:11:48 +0200 |
|---|---|---|
| committer | Anubisss <none@none> | 2009-04-16 00:11:48 +0200 |
| commit | 96ffb827ae8ad6661247fec0835f012a3bdc5281 (patch) | |
| tree | b24502cc5c4a770ce3c883a0e82ed6332a6174dd /src/game/Creature.cpp | |
| parent | 09b4ef5f76d0ef541d8e7c2669f67636ea5c2db9 (diff) | |
*Better names for var Modelid.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Creature.cpp')
| -rw-r--r-- | src/game/Creature.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index c69ae6e8d16..f86df8485df 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -100,20 +100,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; } @@ -1189,8 +1189,8 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask) 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 |