Core/Movement: Clean up and improvements on Unit::SetSpeed (#16843)
- Clean up of Unit::SetSpeed (mostly cherry picks from the 6.x branch): - the opcode sent depends on the unit. until now, MSG_MOVE_SET_* were sent for every units which isn't like retail behavior. - Removed the unused method parameter "forced" from Unit::SetSpeed - Renamed Unit::SetSpeed to SetSpeedRate - Removed the unused method parameter "forced" from Unit::UpdateSpeed - Added utility method Unit::SetSpeed which take the new flat value. Conflicts: src/server/game/Entities/Unit/Unit.cpp src/server/scripts/Commands/cs_modify.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
This commit is contained in:
1 parent
a8b9edefbc
commit
fa8662e617
50 files changed
+146
-140
No files matched your search
@@ -7776,7 +7776,7 @@ bool Unit::AttackStop()
|
||||
if (creature->HasSearchedAssistance())
|
||||
{
|
||||
creature->SetNoSearchAssistance(false);
|
||||
UpdateSpeed(MOVE_RUN, false);
|
||||
UpdateSpeed(MOVE_RUN);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8110,7 +8110,7 @@ void Unit::SetMinion(Minion *minion, bool apply)
|
||||
// FIXME: hack, speed must be set only at follow
|
||||
if (GetTypeId() == TYPEID_PLAYER && minion->IsPet())
|
||||
for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
|
||||
minion->SetSpeed(UnitMoveType(i), m_speed_rate[i], true);
|
||||
minion->SetSpeedRate(UnitMoveType(i), m_speed_rate[i]);
|
||||
|
||||
// Ghoul pets have energy instead of mana (is anywhere better place for this code?)
|
||||
if (minion->IsPetGhoul())
|
||||
@@ -10379,9 +10379,9 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
|
||||
|
||||
if (IsPet())
|
||||
{
|
||||
UpdateSpeed(MOVE_RUN, true);
|
||||
UpdateSpeed(MOVE_SWIM, true);
|
||||
UpdateSpeed(MOVE_FLIGHT, true);
|
||||
UpdateSpeed(MOVE_RUN);
|
||||
UpdateSpeed(MOVE_SWIM);
|
||||
UpdateSpeed(MOVE_FLIGHT);
|
||||
}
|
||||
|
||||
if (!(creature->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_MOUNTED_COMBAT_ALLOWED))
|
||||
@@ -10422,7 +10422,7 @@ void Unit::ClearInCombat()
|
||||
if (Unit* owner = GetOwner())
|
||||
for (uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
|
||||
if (owner->GetSpeedRate(UnitMoveType(i)) > GetSpeedRate(UnitMoveType(i)))
|
||||
SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true);
|
||||
SetSpeedRate(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)));
|
||||
}
|
||||
else if (!IsCharmed())
|
||||
return;
|
||||
@@ -10815,7 +10815,7 @@ void Unit::SetVisible(bool x)
|
||||
UpdateObjectVisibility();
|
||||
}
|
||||
|
||||
void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
|
||||
void Unit::UpdateSpeed(UnitMoveType mtype)
|
||||
{
|
||||
int32 main_speed_mod = 0;
|
||||
float stack_bonus = 1.0f;
|
||||
@@ -10878,7 +10878,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
|
||||
|
||||
// Update speed for vehicle if available
|
||||
if (GetTypeId() == TYPEID_PLAYER && GetVehicle())
|
||||
GetVehicleBase()->UpdateSpeed(MOVE_FLIGHT, true);
|
||||
GetVehicleBase()->UpdateSpeed(MOVE_FLIGHT);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
@@ -10960,7 +10960,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
|
||||
speed = min_speed;
|
||||
}
|
||||
|
||||
SetSpeed(mtype, speed, forced);
|
||||
SetSpeedRate(mtype, speed);
|
||||
}
|
||||
|
||||
float Unit::GetSpeed(UnitMoveType mtype) const
|
||||
@@ -10968,7 +10968,12 @@ float Unit::GetSpeed(UnitMoveType mtype) const
|
||||
return m_speed_rate[mtype]*(IsControlledByPlayer() ? playerBaseMoveSpeed[mtype] : baseMoveSpeed[mtype]);
|
||||
}
|
||||
|
||||
void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
|
||||
void Unit::SetSpeed(UnitMoveType mtype, float newValue)
|
||||
{
|
||||
SetSpeedRate(mtype, newValue / (IsControlledByPlayer() ? playerBaseMoveSpeed[mtype] : baseMoveSpeed[mtype]));
|
||||
}
|
||||
|
||||
void Unit::SetSpeedRate(UnitMoveType mtype, float rate)
|
||||
{
|
||||
if (rate < 0)
|
||||
rate = 0.0f;
|
||||
@@ -11002,7 +11007,7 @@ void Unit::SetSpeed(UnitMoveType mtype, float rate, bool forced)
|
||||
|
||||
if (!IsInCombat())
|
||||
if (Pet* pet = ToPlayer()->GetPet())
|
||||
pet->SetSpeed(mtype, m_speed_rate[mtype], forced);
|
||||
pet->SetSpeedRate(mtype, m_speed_rate[mtype]);
|
||||
}
|
||||
|
||||
static MovementStatusElements const speedVal = MSEExtraFloat;
|
||||
|
||||
Reference in new issue
Block a user