mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10304] Use loop instead repeating code in models check.

Browse source
This commit is contained in:
VladimirMangos 2010-08-01 06:09:25 +04:00
parent 787fb83763
commit c138fbe902
2 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/Creature.cpp
View file

@ -992,23 +992,9 @@ void Creature::SaveToDB(uint32 mapid, uint8 spawnMask, uint32 phaseMask)
if (displayId != cinfo->ModelId[0] && displayId != cinfo->ModelId[1] && if (displayId != cinfo->ModelId[0] && displayId != cinfo->ModelId[1] &&
displayId != cinfo->ModelId[2] && displayId != cinfo->ModelId[3]) displayId != cinfo->ModelId[2] && displayId != cinfo->ModelId[3])
{ {
if (cinfo->ModelId[0]) for(int i = 0; i < MAX_CREATURE_MODEL && displayId; ++i)
if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[0])) if (cinfo->ModelId[i])
if (displayId == minfo->modelid_other_gender) if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[i]))
displayId = 0;
if (displayId && cinfo->ModelId[1])
if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[1]))
if (displayId == minfo->modelid_other_gender)
displayId = 0;
if (displayId && cinfo->ModelId[2])
if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[2]))
if (displayId == minfo->modelid_other_gender)
displayId = 0;
if (displayId && cinfo->ModelId[3])
if (CreatureModelInfo const *minfo = sObjectMgr.GetCreatureModelInfo(cinfo->ModelId[3]))
if (displayId == minfo->modelid_other_gender) if (displayId == minfo->modelid_other_gender)
displayId = 0; displayId = 0;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10303" #define REVISION_NR "10304"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__