aboutsummaryrefslogtreecommitdiff
path: root/src/game/Pet.cpp
diff options
context:
space:
mode:
authorn0n4m3 <none@none>2010-01-13 19:11:46 +0300
committern0n4m3 <none@none>2010-01-13 19:11:46 +0300
commitf7ad3aefc8e63e87c29d5e9c169210f4e7e80ac8 (patch)
tree7418fd8e76d498bb754b3b92b981743e20199f98 /src/game/Pet.cpp
parentedeb6bf284e9f7ab501f6c3273221dbf02d60084 (diff)
Removed all my commits for today, this is hack? really? okey
--HG-- branch : trunk
Diffstat (limited to 'src/game/Pet.cpp')
-rw-r--r--src/game/Pet.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 261eca21701..5fe6a64932d 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -498,10 +498,7 @@ void Pet::setDeathState(DeathState s) // overwrite virtual
void Pet::Update(uint32 diff)
{
- if (m_removed) // pet already removed, just wait in remove queue, no updates
- return;
-
- if (m_loading)
+ if(m_removed) // pet already removed, just wait in remove queue, no updates
return;
switch( m_deathState )
@@ -972,22 +969,6 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel * 4 + petlevel));
break;
}
- case 19833: //Snake Trap - Venomous Snake
- {
- SetCreateHealth(uint32(107 * (petlevel - 40) * 0.025f));
- SetCreateMana(0);
- SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float((petlevel / 2) - 25));
- SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float((petlevel / 2) - 18));
- break;
- }
- case 19921: //Snake Trap - Viper
- {
- SetCreateHealth(uint32(107 * (petlevel - 40) * 0.025f));
- SetCreateMana(0);
- SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel / 2 - 10));
- SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel / 2));
- break;
- }
case 31216: // Mirror Image
{
SetBonusDamage(int32(m_owner->SpellBaseDamageBonus(SPELL_SCHOOL_MASK_FROST) * 0.33f));