* Change name of recently added scriptAI functions to better reflect purpose

* Fix typo in 3910_world.sql, spotted by irish

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-06-11 17:54:59 +02:00
parent 8fed6e39f5
commit 6eaf6e962a
6 changed files with 8 additions and 9 deletions
+2 -2
View File
@@ -1351,7 +1351,7 @@ void Creature::SelectLevel(const CreatureInfo *cinfo)
SetCreateHealth(health);
SetMaxHealth(health);
SetHealth(health);
ResetDamageByPlayers();
ResetPlayerDamageReq();
// mana
uint32 minmana = std::min(cinfo->maxmana, cinfo->minmana);
@@ -1742,7 +1742,7 @@ void Creature::setDeathState(DeathState s)
// setActive(true);
SetHealth(GetMaxHealth());
SetLootRecipient(NULL);
ResetDamageByPlayers();
ResetPlayerDamageReq();
Unit::setDeathState(ALIVE);
CreatureInfo const *cinfo = GetCreatureInfo();
RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
+2 -2
View File
@@ -723,12 +723,12 @@ class TRINITY_DLL_SPEC Creature : public Unit
void SetDisableReputationGain(bool disable) { DisableReputationGain = disable; }
bool IsReputationGainDisabled() { return DisableReputationGain; }
bool IsDamageEnoughForLootingAndReward() { return m_PlayerDamageReq == 0; }
void AddDamageByPlayers(uint32 unDamage)
void LowerPlayerDamageReq(uint32 unDamage)
{
if(m_PlayerDamageReq)
m_PlayerDamageReq > unDamage ? m_PlayerDamageReq -= unDamage : m_PlayerDamageReq = 0;
}
void ResetDamageByPlayers() { m_PlayerDamageReq = GetHealth() / 2; }
void ResetPlayerDamageReq() { m_PlayerDamageReq = GetHealth() / 2; }
uint32 m_PlayerDamageReq;
void SetOriginalEntry(uint32 entry) { m_originalEntry = entry; }
+1 -1
View File
@@ -184,7 +184,7 @@ bool CreatureAI::_EnterEvadeMode()
me->CombatStop(true);
me->LoadCreaturesAddon();
me->SetLootRecipient(NULL);
me->ResetDamageByPlayers();
me->ResetPlayerDamageReq();
return true;
}
+1 -2
View File
@@ -588,7 +588,6 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
if(pVictim->GetTypeId() == TYPEID_UNIT && ((Creature*)pVictim)->IsAIEnabled)
{
((Creature*)pVictim)->AI()->DamageTaken(this, damage);
((Creature*)pVictim)->AddDamageByPlayers(damage);
}
if (damagetype != NODAMAGE)
{
@@ -706,7 +705,7 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
((Creature*)pVictim)->SetLootRecipient(this);
if(IsControlledByPlayer())
((Creature*)pVictim)->AddDamageByPlayers(health < damage ? health : damage);
((Creature*)pVictim)->LowerPlayerDamageReq(health < damage ? health : damage);
}
if (health <= damage)