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

Default behaviour of pets for creatures changed to REACT_DEFENSIVE

Browse source 
Fixed typo: changed m_ReactSate to m_reactState
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2008-10-26 18:24:45 +01:00
parent f8a94b84c3
commit 6f6a1a7608
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellEffects.cpp
View file

@ -4038,12 +4038,16 @@ void Spell::EffectSummonPet(uint32 i)
NewSummon->setPetType(SUMMON_PET);
uint32 faction = m_caster->getFaction();
if(m_caster->GetTypeId() == TYPEID_UNIT && ((Creature*)m_caster)->isTotem())
if(m_caster->GetTypeId() == TYPEID_UNIT)
{
Unit* owner = ((Totem*)m_caster)->GetOwner();
if(owner)
faction = owner->getFaction();
NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
if ( ((Creature*)m_caster)->isTotem() )
NewSummon->GetCharmInfo()->SetReactState(REACT_AGGRESSIVE);
else
NewSummon->GetCharmInfo()->SetReactState(REACT_DEFENSIVE);
}
NewSummon->SetUInt64Value(UNIT_FIELD_SUMMONEDBY, m_caster->GetGUID());

2
src/game/Unit.cpp
View file

@ -9808,7 +9808,7 @@ CharmInfo* Unit::InitCharmInfo(Unit *charm)
}
CharmInfo::CharmInfo(Unit* unit)
: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_ReactSate(REACT_PASSIVE), m_petnumber(0)
: m_unit(unit), m_CommandState(COMMAND_FOLLOW), m_reactState(REACT_PASSIVE), m_petnumber(0)
{
for(int i =0; i<4; ++i)
{

8
src/game/Unit.h
View file

@ -643,9 +643,9 @@ struct CharmInfo
void SetCommandState(CommandStates st) { m_CommandState = st; }
CommandStates GetCommandState() { return m_CommandState; }
bool HasCommandState(CommandStates state) { return (m_CommandState == state); }
void SetReactState(ReactStates st) { m_ReactSate = st; }
ReactStates GetReactState() { return m_ReactSate; }
bool HasReactState(ReactStates state) { return (m_ReactSate == state); }
void SetReactState(ReactStates st) { m_reactState = st; }
ReactStates GetReactState() { return m_reactState; }
bool HasReactState(ReactStates state) { return (m_reactState == state); }
void InitPossessCreateSpells();
void InitCharmCreateSpells();
@ -662,7 +662,7 @@ struct CharmInfo
UnitActionBarEntry PetActionBar[10];
CharmSpellEntry m_charmspells[4];
CommandStates m_CommandState;
ReactStates m_ReactSate;
ReactStates m_reactState;
uint32 m_petnumber;
};