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

[10391] Restore build at Unix after Unit::GetUnit drop.

Browse source
This commit is contained in:
VladimirMangos 2010-08-20 23:42:29 +04:00
parent 9c02f476ec
commit 9d76725a0e
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Creature.cpp
View file

@ -206,9 +206,9 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
// difficulties for dungeons/battleground ordered in normal way
// and if more high version not exist must be used lesser version
// for raid order different:
// 10 man normal version must be used instead not existed 10 man heroic version
// 25 man normal version must be used instead not existed 24 man heroic version
// for raid order different:
// 10 man normal version must be used instead not existed 10 man heroic version
// 25 man normal version must be used instead not existed 24 man heroic version
CreatureInfo const *cinfo = normalInfo;
for (uint8 diff = uint8(GetMap()->GetDifficulty()); diff > 0;)
{

5
src/game/Unit.cpp
View file

@ -5710,6 +5710,11 @@ Pet* Unit::GetPet() const
return NULL;
}
Pet* Unit::_GetPet(ObjectGuid guid) const
{
return GetMap()->GetPet(guid);
}
Unit* Unit::GetCharm() const
{
if (uint64 charm_guid = GetCharmGUID())

5
src/game/Unit.h
View file

@ -1945,6 +1945,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
uint32 GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const;
Unit* _GetTotem(TotemSlot slot) const; // for templated function without include need
Pet* _GetPet(ObjectGuid guid) const; // for templated function without include need
uint32 m_state; // Even derived shouldn't modify
uint32 m_CombatTimer;
@ -1978,7 +1979,7 @@ void Unit::CallForAllControlledUnits(Func const& func, bool withTotems, bool wit
if (withGuardians)
{
for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
if (Pet* guardian = GetMap()->GetPet(*itr))
if (Pet* guardian = _GetPet(*itr))
func(guardian);
}
@ -2005,7 +2006,7 @@ bool Unit::CheckAllControlledUnits(Func const& func, bool withTotems, bool withG
if (withGuardians)
{
for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
if (Pet const* guardian = GetMap()->GetPet(*itr))
if (Pet const* guardian = _GetPet(*itr))
if (func(guardian))
return true;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10390"
#define REVISION_NR "10391"
#endif // __REVISION_NR_H__