LEGO_Universe/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer synced 2024-08-30 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use better height and path checking

Browse Source 
Fix issue with paths entering infinite loop
fix default position height being at height 0.
This commit is contained in:
David Markowitz 2023-08-24 03:40:10 -07:00
parent dd2338601e
commit 458db4682b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dGame/dComponents/BaseCombatAIComponent.cpp
View File

@ -648,7 +648,7 @@ void BaseCombatAIComponent::Wander() {
const NiPoint3 delta = const NiPoint3 delta =
{ {
radius * cos(theta), radius * cos(theta),
0, m_Parent->GetPosition().y,
radius * sin(theta) radius * sin(theta)
}; };

4
dGame/dComponents/MovementAIComponent.cpp
View File

@ -197,6 +197,7 @@ void MovementAIComponent::ReversePath() {
} }
bool MovementAIComponent::AdvancePathWaypointIndex() { bool MovementAIComponent::AdvancePathWaypointIndex() {
if (m_CurrentPath.empty()) return false;
m_CurrentPathWaypointIndex = m_NextPathWaypointIndex; m_CurrentPathWaypointIndex = m_NextPathWaypointIndex;
if (m_IsInReverse) { if (m_IsInReverse) {
if (m_CurrentPathWaypointIndex >= 0) m_NextPathWaypointIndex--; if (m_CurrentPathWaypointIndex >= 0) m_NextPathWaypointIndex--;
@ -469,7 +470,8 @@ void MovementAIComponent::HandleWaypointArrived(uint32_t commandIndex) {
m_Parent->TriggerEvent(eTriggerEventType::ARRIVED_AT_DESIRED_WAYPOINT); m_Parent->TriggerEvent(eTriggerEventType::ARRIVED_AT_DESIRED_WAYPOINT);
if (!m_Path || commandIndex >= m_Path->pathWaypoints.at(m_CurrentPathWaypointIndex).commands.size()) { if (!m_Path || commandIndex >= m_Path->pathWaypoints.at(m_CurrentPathWaypointIndex).commands.size()) {
if (!AdvancePathWaypointIndex()) { if (!AdvancePathWaypointIndex()) {
if (m_Path) { // We only want to handle path logic if we actually have a path setup for following
if (m_Path && !m_CurrentPath.empty()) {
if (m_Path->pathBehavior == PathBehavior::Bounce) { if (m_Path->pathBehavior == PathBehavior::Bounce) {
ReversePath(); ReversePath();
} else if (m_Path->pathBehavior == PathBehavior::Loop) { } else if (m_Path->pathBehavior == PathBehavior::Loop) {