Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-25 06:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: movement ai remove goto, do todo, remove unused call (#1505)

Browse Source 
* remove goto

* Update MovementAIComponent.cpp
This commit is contained in:
David Markowitz 2024-03-24 20:24:38 -07:00 committed by GitHub
parent 3262bc3a86
commit 2b253a8248
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dGame/dComponents/BaseCombatAIComponent.cpp
View File

@ -162,7 +162,6 @@ void BaseCombatAIComponent::Update(const float deltaTime) {
// Check if we should stop the tether effect // Check if we should stop the tether effect
if (m_TetherEffectActive) { if (m_TetherEffectActive) {
m_TetherTime -= deltaTime; m_TetherTime -= deltaTime;
const auto& info = m_MovementAI->GetInfo();
if (m_Target != LWOOBJID_EMPTY || (NiPoint3::DistanceSquared( if (m_Target != LWOOBJID_EMPTY || (NiPoint3::DistanceSquared(
m_StartPosition, m_StartPosition,
m_Parent->GetPosition()) < 20 * 20 && m_TetherTime <= 0) m_Parent->GetPosition()) < 20 * 20 && m_TetherTime <= 0)

17
dGame/dComponents/MovementAIComponent.cpp
View File

@ -96,17 +96,12 @@ void MovementAIComponent::Update(const float deltaTime) {
if (m_NextWaypoint == source) { if (m_NextWaypoint == source) {
m_TimeToTravel = 0.0f; m_TimeToTravel = 0.0f;
} else {
goto nextAction;
}
if (m_CurrentSpeed < m_MaxSpeed) { if (m_CurrentSpeed < m_MaxSpeed) {
m_CurrentSpeed += m_Acceleration; m_CurrentSpeed += m_Acceleration;
} }
if (m_CurrentSpeed > m_MaxSpeed) { m_CurrentSpeed = std::min(m_CurrentSpeed, m_MaxSpeed);
m_CurrentSpeed = m_MaxSpeed;
}
const auto speed = m_CurrentSpeed * m_BaseSpeed; // scale speed based on base speed const auto speed = m_CurrentSpeed * m_BaseSpeed; // scale speed based on base speed
@ -114,7 +109,7 @@ void MovementAIComponent::Update(const float deltaTime) {
// Normalize the vector // Normalize the vector
const auto length = delta.Length(); const auto length = delta.Length();
if (length > 0) { if (length > 0.0f) {
velocity = (delta / length) * speed; velocity = (delta / length) * speed;
} }
@ -123,6 +118,7 @@ void MovementAIComponent::Update(const float deltaTime) {
m_TimeToTravel = length / speed; m_TimeToTravel = length / speed;
SetRotation(NiQuaternion::LookAt(source, m_NextWaypoint)); SetRotation(NiQuaternion::LookAt(source, m_NextWaypoint));
}
} else { } else {
// Check if there are more waypoints in the queue, if so set our next destination to the next waypoint // Check if there are more waypoints in the queue, if so set our next destination to the next waypoint
if (m_CurrentPath.empty()) { if (m_CurrentPath.empty()) {
@ -135,8 +131,6 @@ void MovementAIComponent::Update(const float deltaTime) {
m_CurrentPath.pop(); m_CurrentPath.pop();
} }
nextAction:
SetVelocity(velocity); SetVelocity(velocity);
Game::entityManager->SerializeEntity(m_Parent); Game::entityManager->SerializeEntity(m_Parent);
@ -319,8 +313,7 @@ void MovementAIComponent::SetDestination(const NiPoint3& destination) {
auto step = delta / 10.0f; auto step = delta / 10.0f;
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
// TODO: Replace this with += when the NiPoint3::operator+= is fixed start += step;
start = start + step;
computedPath.push_back(start); computedPath.push_back(start);
} }