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

[11105] Melee attacks distance

Browse source 
Inspired by patch provided by Feanordev.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
Schmoozerd 2011-02-03 00:35:53 +03:00 • committed by VladimirMangos
parent aa4c1be8cf
commit 8e68d1bcaf
13 changed files with 77 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/game/Player.cpp
View file

@ -1269,24 +1269,22 @@ void Player::Update( uint32 update_diff, uint32 p_time )
// default combat reach 10
// TODO add weapon,skill check
float pldistance = ATTACK_DISTANCE;
if (isAttackReady(BASE_ATTACK))
{
if(!IsWithinDistInMap(pVictim, pldistance))
if (!CanReachWithMeleeAttack(pVictim))
{
setAttackTimer(BASE_ATTACK,100);
if(m_swingErrorMsg != 1) // send single time (client auto repeat)
if (m_swingErrorMsg != 1) // send single time (client auto repeat)
{
SendAttackSwingNotInRange();
m_swingErrorMsg = 1;
}
}
//120 degrees of radiant range
else if( !HasInArc( 2*M_PI_F/3, pVictim ))
else if (!HasInArc(2*M_PI_F/3, pVictim))
{
setAttackTimer(BASE_ATTACK,100);
if(m_swingErrorMsg != 2) // send single time (client auto repeat)
if (m_swingErrorMsg != 2) // send single time (client auto repeat)
{
SendAttackSwingBadFacingAttack();
m_swingErrorMsg = 2;
@ -1297,7 +1295,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
m_swingErrorMsg = 0; // reset swing error state
// prevent base and off attack in same time, delay attack at 0.2 sec
if(haveOffhandWeapon())
if (haveOffhandWeapon())
{
uint32 off_att = getAttackTimer(OFF_ATTACK);
if(off_att < ATTACK_DISPLAY_DELAY)
@ -1308,13 +1306,13 @@ void Player::Update( uint32 update_diff, uint32 p_time )
}
}
if ( haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
if (haveOffhandWeapon() && isAttackReady(OFF_ATTACK))
{
if(!IsWithinDistInMap(pVictim, pldistance))
if (!CanReachWithMeleeAttack(pVictim))
{
setAttackTimer(OFF_ATTACK,100);
}
else if( !HasInArc( 2*M_PI_F/3, pVictim ))
else if (!HasInArc(2*M_PI_F/3, pVictim))
{
setAttackTimer(OFF_ATTACK,100);
}
@ -1332,7 +1330,7 @@ void Player::Update( uint32 update_diff, uint32 p_time )
Unit *owner = pVictim->GetOwner();
Unit *u = owner ? owner : pVictim;
if(u->IsPvP() && (!duel || duel->opponent != u))
if (u->IsPvP() && (!duel || duel->opponent != u))
{
UpdatePvP(true);
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_ENTER_PVP_COMBAT);
@ -1340,9 +1338,9 @@ void Player::Update( uint32 update_diff, uint32 p_time )
}
}
if(HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING))
{
if(roll_chance_i(3) && GetTimeInnEnter() > 0) //freeze update
if (roll_chance_i(3) && GetTimeInnEnter() > 0) //freeze update
{
time_t time_inn = time(NULL)-GetTimeInnEnter();
if (time_inn >= 10) //freeze update