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

[7163] Pet constructor cleanup.

Browse source 
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2009-01-24 20:43:34 +01:00
parent 302dc70eab
commit 8275ff9a36
2 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/game/Pet.cpp
View file

@ -39,25 +39,14 @@ char const* petTypeSuffix[MAX_PET_TYPE] =
"'s Companion" // MINI_PET "'s Companion" // MINI_PET
}; };
Pet::Pet(PetType type) : Creature() Pet::Pet(PetType type) :
Creature(), m_petType(type), m_removed(false), m_happinessTimer(7500), m_duration(0), m_bonusdamage(0),
m_resetTalentsCost(0), m_resetTalentsTime(0), m_usedTalentCount(0), m_auraUpdateMask(0), m_loading(false),
m_declinedname(NULL)
{ {
m_isPet = true; m_isPet = true;
m_name = "Pet"; m_name = "Pet";
m_petType = type;
m_removed = false;
m_regenTimer = 4000; m_regenTimer = 4000;
m_happinessTimer = 7500;
m_duration = 0;
m_bonusdamage = 0;
m_resetTalentsCost = 0;
m_resetTalentsTime = 0;
m_usedTalentCount = 0;
m_auraUpdateMask = 0;
m_loading = false;
// pets always have a charminfo, even if they are not actually charmed // pets always have a charminfo, even if they are not actually charmed
CharmInfo* charmInfo = InitCharmInfo(this); CharmInfo* charmInfo = InitCharmInfo(this);
@ -66,13 +55,6 @@ Pet::Pet(PetType type) : Creature()
charmInfo->SetReactState(REACT_PASSIVE); charmInfo->SetReactState(REACT_PASSIVE);
else if(type == GUARDIAN_PET) // always aggressive else if(type == GUARDIAN_PET) // always aggressive
charmInfo->SetReactState(REACT_AGGRESSIVE); charmInfo->SetReactState(REACT_AGGRESSIVE);
m_spells.clear();
m_Auras.clear();
m_CreatureSpellCooldowns.clear();
m_CreatureCategoryCooldowns.clear();
m_autospells.clear();
m_declinedname = NULL;
} }
Pet::~Pet() Pet::~Pet()

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 "7162" #define REVISION_NR "7163"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__