Skip to content

Commit

Permalink
[9212] Implement pet speed synchronization with owner only for follow…
Browse files Browse the repository at this point in the history 
… mode.

* This allow pet use own speed (and all speed affects appiedto pet itself) in combat.
* Apply this speed synhronization to minipets/guardians also.
* Also rename Unit::SetSpeed to SetSpeedRate as more close to real functionality.
  • Loading branch information
VladimirMangos committed Jan 19, 2010
1 parent 87c022a commit 12dbe76
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 22 deletions.
6 changes: 3 additions & 3 deletions src/game/Creature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )

SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);

SetSpeed(MOVE_WALK, cinfo->speed );
SetSpeed(MOVE_RUN, cinfo->speed );
SetSpeed(MOVE_SWIM, cinfo->speed );
SetSpeedRate(MOVE_WALK, cinfo->speed );
SetSpeedRate(MOVE_RUN, cinfo->speed );
SetSpeedRate(MOVE_SWIM, cinfo->speed );

SetFloatValue(OBJECT_FIELD_SCALE_X, cinfo->scale);

Expand Down
18 changes: 9 additions & 9 deletions src/game/Level1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,11 @@ bool ChatHandler::HandleModifyASpeedCommand(const char* args)
if (needReportToTarget(chr))
ChatHandler(chr).PSendSysMessage(LANG_YOURS_ASPEED_CHANGED, GetNameLink().c_str(), ASpeed);

chr->SetSpeed(MOVE_WALK, ASpeed,true);
chr->SetSpeed(MOVE_RUN, ASpeed,true);
chr->SetSpeed(MOVE_SWIM, ASpeed,true);
//chr->SetSpeed(MOVE_TURN, ASpeed,true);
chr->SetSpeed(MOVE_FLIGHT, ASpeed,true);
chr->SetSpeedRate(MOVE_WALK, ASpeed,true);
chr->SetSpeedRate(MOVE_RUN, ASpeed,true);
chr->SetSpeedRate(MOVE_SWIM, ASpeed,true);
//chr->SetSpeed(MOVE_TURN, ASpeed,true);
chr->SetSpeedRate(MOVE_FLIGHT, ASpeed,true);
return true;
}

Expand Down Expand Up @@ -1184,7 +1184,7 @@ bool ChatHandler::HandleModifySpeedCommand(const char* args)
if (needReportToTarget(chr))
ChatHandler(chr).PSendSysMessage(LANG_YOURS_SPEED_CHANGED, GetNameLink().c_str(), Speed);

chr->SetSpeed(MOVE_RUN,Speed,true);
chr->SetSpeedRate(MOVE_RUN,Speed,true);

return true;
}
Expand Down Expand Up @@ -1229,7 +1229,7 @@ bool ChatHandler::HandleModifySwimCommand(const char* args)
if (needReportToTarget(chr))
ChatHandler(chr).PSendSysMessage(LANG_YOURS_SWIM_SPEED_CHANGED, GetNameLink().c_str(), Swim);

chr->SetSpeed(MOVE_SWIM,Swim,true);
chr->SetSpeedRate(MOVE_SWIM,Swim,true);

return true;
}
Expand Down Expand Up @@ -1274,7 +1274,7 @@ bool ChatHandler::HandleModifyBWalkCommand(const char* args)
if (needReportToTarget(chr))
ChatHandler(chr).PSendSysMessage(LANG_YOURS_BACK_SPEED_CHANGED, GetNameLink().c_str(), BSpeed);

chr->SetSpeed(MOVE_RUN_BACK,BSpeed,true);
chr->SetSpeedRate(MOVE_RUN_BACK,BSpeed,true);

return true;
}
Expand Down Expand Up @@ -1310,7 +1310,7 @@ bool ChatHandler::HandleModifyFlyCommand(const char* args)
if (needReportToTarget(chr))
ChatHandler(chr).PSendSysMessage(LANG_YOURS_FLY_SPEED_CHANGED, GetNameLink().c_str(), FSpeed);

chr->SetSpeed(MOVE_FLIGHT,FSpeed,true);
chr->SetSpeedRate(MOVE_FLIGHT,FSpeed,true);

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/game/MovementHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ void WorldSession::HandleForceSpeedChangeAck(WorldPacket &recv_data)
{
sLog.outError("%sSpeedChange player %s is NOT correct (must be %f instead %f), force set to correct value",
move_type_name[move_type], _player->GetName(), _player->GetSpeed(move_type), newspeed);
_player->SetSpeed(move_type,_player->GetSpeedRate(move_type),true);
_player->SetSpeedRate(move_type,_player->GetSpeedRate(move_type),true);
}
else // must be lesser - cheating
{
Expand Down
22 changes: 22 additions & 0 deletions src/game/TargetedMovementGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ void FollowMovementGenerator<Player>::Initialize(Player &owner)
{
owner.addUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
_updateWalkMode(owner);
_updateSpeed(owner);
_setTargetLocation(owner);
}

Expand All @@ -251,6 +252,7 @@ void FollowMovementGenerator<Creature>::Initialize(Creature &owner)
{
owner.addUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
_updateWalkMode(owner);
_updateSpeed(owner);

if (((Creature*)&owner)->canFly())
owner.AddMonsterMoveFlag(MONSTER_MOVE_FLY);
Expand All @@ -263,13 +265,15 @@ void FollowMovementGenerator<T>::Finalize(T &owner)
{
owner.clearUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
_updateWalkMode(owner);
_updateSpeed(owner);
}

template<class T>
void FollowMovementGenerator<T>::Interrupt(T &owner)
{
owner.clearUnitState(UNIT_STAT_FOLLOW|UNIT_STAT_FOLLOW_MOVE);
_updateWalkMode(owner);
_updateSpeed(owner);
}

template<class T>
Expand All @@ -278,6 +282,24 @@ void FollowMovementGenerator<T>::Reset(T &owner)
Initialize(owner);
}

template<>
void FollowMovementGenerator<Player>::_updateSpeed(Player &u)
{
// nothing to do for Player
}

template<>
void FollowMovementGenerator<Creature>::_updateSpeed(Creature &u)
{
// pet only sync speed with owner
if (!((Creature&)u).isPet() || !i_target.isValid() || i_target->GetGUID() != u.GetOwnerGUID())
return;

u.UpdateSpeed(MOVE_RUN,true);
u.UpdateSpeed(MOVE_WALK,true);
u.UpdateSpeed(MOVE_SWIM,true);
}

//-----------------------------------------------//
template void TargetedMovementGeneratorMedium<Player,ChaseMovementGenerator<Player> >::_setTargetLocation(Player &);
template void TargetedMovementGeneratorMedium<Player,FollowMovementGenerator<Player> >::_setTargetLocation(Player &);
Expand Down
1 change: 1 addition & 0 deletions src/game/TargetedMovementGenerator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class MANGOS_DLL_SPEC FollowMovementGenerator : public TargetedMovementGenerator
void _reachTarget(T &) {}
private:
void _updateWalkMode(T &u);
void _updateSpeed(T &u);
};

#endif
42 changes: 35 additions & 7 deletions src/game/Unit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8400,7 +8400,7 @@ void Unit::SetPet(Pet* pet)
// FIXME: hack, speed must be set only at follow
if(pet && GetTypeId()==TYPEID_PLAYER)
for(int i = 0; i < MAX_MOVE_TYPE; ++i)
pet->SetSpeed(UnitMoveType(i), m_speed_rate[i], true);
pet->SetSpeedRate(UnitMoveType(i), m_speed_rate[i], true);
}

void Unit::SetCharm(Unit* pet)
Expand Down Expand Up @@ -10428,6 +10428,23 @@ void Unit::UpdateWalkMode(Unit* source, bool self)

void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
{
// not in combat pet have same speed as owner
switch(mtype)
{
case MOVE_RUN:
case MOVE_WALK:
case MOVE_SWIM:
if (GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isPet() && hasUnitState(UNIT_STAT_FOLLOW))
{
if(Unit* owner = GetOwner())
{
SetSpeedRate(mtype,owner->GetSpeedRate(mtype),forced);
return;
}
}
break;
}

int32 main_speed_mod = 0;
float stack_bonus = 1.0f;
float non_stack_bonus = 1.0f;
Expand Down Expand Up @@ -10519,15 +10536,23 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
if (speed < min_speed)
speed = min_speed;
}
SetSpeed(mtype, speed, forced);
SetSpeedRate(mtype, speed, forced);
}

float Unit::GetSpeed( UnitMoveType mtype ) const
{
return m_speed_rate[mtype]*baseMoveSpeed[mtype];
}

void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
struct SetSpeedRateHelper
{
explicit SetSpeedRateHelper(UnitMoveType _mtype, bool _forced) : mtype(_mtype), forced(_forced) {}
void operator()(Unit* unit) const { unit->UpdateSpeed(mtype,forced); }
UnitMoveType mtype;
bool forced;
};

void Unit::SetSpeedRate(UnitMoveType mtype, float rate, bool forced)
{
if (rate < 0)
rate = 0.0f;
Expand Down Expand Up @@ -10573,7 +10598,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
data.Initialize(MSG_MOVE_SET_PITCH_RATE, 8+4+2+4+4+4+4+4+4+4);
break;
default:
sLog.outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.",mtype);
sLog.outError("Unit::SetSpeedRate: Unsupported move type (%d), data not sent to client.",mtype);
return;
}

Expand Down Expand Up @@ -10628,7 +10653,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
data.Initialize(SMSG_FORCE_PITCH_RATE_CHANGE, 16);
break;
default:
sLog.outError("Unit::SetSpeed: Unsupported move type (%d), data not sent to client.",mtype);
sLog.outError("Unit::SetSpeedRate: Unsupported move type (%d), data not sent to client.",mtype);
return;
}
data.append(GetPackGUID());
Expand All @@ -10638,8 +10663,11 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
data << float(GetSpeed(mtype));
SendMessageToSet( &data, true );
}
if(Pet* pet = GetPet())
pet->SetSpeed(MOVE_RUN, m_speed_rate[mtype],forced);

if (GetTypeId() == TYPEID_PLAYER) // need include minpet
((Player*)this)->CallForAllControlledUnits(SetSpeedRateHelper(mtype,forced),false,true,true,true);
else
CallForAllControlledUnits(SetSpeedRateHelper(mtype,forced),false,true,true);
}

void Unit::SetHover(bool on)
Expand Down
2 changes: 1 addition & 1 deletion src/game/Unit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
void UpdateSpeed(UnitMoveType mtype, bool forced);
float GetSpeed( UnitMoveType mtype ) const;
float GetSpeedRate( UnitMoveType mtype ) const { return m_speed_rate[mtype]; }
void SetSpeed(UnitMoveType mtype, float rate, bool forced = false);
void SetSpeedRate(UnitMoveType mtype, float rate, bool forced = false);

void SetHover(bool on);
bool isHover() const { return HasAuraType(SPELL_AURA_HOVER); }
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9211"
#define REVISION_NR "9212"
#endif // __REVISION_NR_H__

3 comments on commit 12dbe76

@Wowka321
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

../../../src/game/TargetedMovementGenerator.cpp:280: ошибка: specialization of ‘void FollowMovementGenerator::_updateSpeed(T&) [with T = Player]’ after instantiation
../../../src/game/TargetedMovementGenerator.cpp:286: ошибка: specialization of ‘void FollowMovementGenerator::_updateSpeed(T&) [with T = Creature]’ after instantiation

@Wowka321
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thing, it must resolve issue.
http://paste2.org/p/621592

@VladimirMangos
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grr.... hate VS for absent stricted C++ standard follow mode..

Patch applied in [9215]. Thank you :)

Please sign in to comment.