From 0914885ab84cabe208a7a369c347f051e91cd4e8 Mon Sep 17 00:00:00 2001
From: Image <image.emagi@gmail.com>
Date: Sun, 2 May 2021 15:43:55 -0400
Subject: [PATCH] Waypoint update gap resolved with movement
---
EQ2/source/WorldServer/Spawn.cpp | 126 ++++++++++++++++---------------
EQ2/source/WorldServer/Spawn.h | 1 +
2 files changed, 67 insertions(+), 60 deletions(-)
diff --git a/EQ2/source/WorldServer/Spawn.cpp b/EQ2/source/WorldServer/Spawn.cpp
index 70484a565..a05e4c571 100644
--- a/EQ2/source/WorldServer/Spawn.cpp
+++ b/EQ2/source/WorldServer/Spawn.cpp
@@ -3131,10 +3131,26 @@ void Spawn::ClearRunningLocations(){
while(RemoveRunningLocation()){}
}
+void Spawn::NewWaypointChange(MovementLocation* data){
+ if(data){
+ if(NeedsToResumeMovement()){
+ resume_movement = true;
+ NeedsToResumeMovement(false);
+ }
+ if(!data->attackable)
+ SetHeading(GetSpawnOrigHeading());
+ }
+
+ if (data && data->lua_function.length() > 0)
+ GetZone()->CallSpawnScript(this, SPAWN_SCRIPT_CUSTOM, 0, data->lua_function.c_str());
+
+ RemoveRunningLocation();
+}
+
bool Spawn::CalculateChange(){
bool remove_needed = false;
- if(movement_locations && MMovementLocations){
- MovementLocation* data = 0;
+ MovementLocation* data = 0;
+ if(movement_locations && MMovementLocations){
MMovementLocations->readlock(__FUNCTION__, __LINE__);
if(movement_locations->size() > 0){
// Target location
@@ -3142,68 +3158,58 @@ bool Spawn::CalculateChange(){
// If no target or we are at the target location need to remove this point
if(!data || (data->x == GetX() && data->y == GetY() && data->z == GetZ()))
remove_needed = true;
- if(data){
- if(NeedsToResumeMovement()){
- resume_movement = true;
- NeedsToResumeMovement(false);
- }
- if(!data->attackable)
- SetHeading(GetSpawnOrigHeading());
}
- }
MMovementLocations->releasereadlock(__FUNCTION__, __LINE__);
- if(remove_needed) {
- if (data && data->lua_function.length() > 0)
- GetZone()->CallSpawnScript(this, SPAWN_SCRIPT_CUSTOM, 0, data->lua_function.c_str());
+ }
+
+ if(remove_needed){
+ NewWaypointChange(data);
+ }
+ else if(data){
+ // Speed is per second so we need a time_step (amount of time since the last update) to modify movement by
+ float time_step = (Timer::GetCurrentTime2() - last_movement_update) * 0.001; // * 0.001 is the same as / 1000, float muliplications is suppose to be faster though
- RemoveRunningLocation();
- //CalculateChange();
+ // Get current location
+ float nx = GetX();
+ float ny = GetY();
+ float nz = GetZ();
+
+ // Get Forward vecotr
+ float tar_vx = data->x - nx;
+ float tar_vy = data->y - ny;
+ float tar_vz = data->z - nz;
+
+ // Multiply speed by the time_step to get how much should have changed over the last tick
+ float speed = GetSpeed() * time_step;
+
+ // Normalize the forward vector and multiply by speed, this gives us our change in coords, just need to add them to our current coords
+ float len = sqrtf(tar_vx * tar_vx + tar_vy * tar_vy + tar_vz * tar_vz);
+ tar_vx = (tar_vx / len) * speed;
+ tar_vy = (tar_vy / len) * speed;
+ tar_vz = (tar_vz / len) * speed;
+
+ // Distance less then 0.5 just set the npc to the target location
+ if (GetDistance(data->x, data->y, data->z, IsWidget() ? false : true) <= speed) {
+ SetX(data->x, false);
+ SetZ(data->z, false);
+ SetY(data->y, false, true);
+ remove_needed = true;
+ NewWaypointChange(data);
}
- else if(data){
- // Speed is per second so we need a time_step (amount of time since the last update) to modify movement by
- float time_step = (Timer::GetCurrentTime2() - last_movement_update) * 0.001; // * 0.001 is the same as / 1000, float muliplications is suppose to be faster though
-
- // Get current location
- float nx = GetX();
- float ny = GetY();
- float nz = GetZ();
-
- // Get Forward vecotr
- float tar_vx = data->x - nx;
- float tar_vy = data->y - ny;
- float tar_vz = data->z - nz;
-
- // Multiply speed by the time_step to get how much should have changed over the last tick
- float speed = GetSpeed() * time_step;
-
- // Normalize the forward vector and multiply by speed, this gives us our change in coords, just need to add them to our current coords
- float len = sqrtf(tar_vx * tar_vx + tar_vy * tar_vy + tar_vz * tar_vz);
- tar_vx = (tar_vx / len) * speed;
- tar_vy = (tar_vy / len) * speed;
- tar_vz = (tar_vz / len) * speed;
-
- // Distance less then 0.5 just set the npc to the target location
- float dist = (data->speed > 0.5f) ? data->speed : 0.5f;
- if (GetDistance(data->x, data->y, data->z, IsWidget() ? false : true) <= dist) {
- SetX(data->x, false);
- SetZ(data->z, false);
- SetY(data->y, false, true);
- }
- else {
- SetX(nx + tar_vx, false);
- SetZ(nz + tar_vz, false);
- if ( IsWidget() )
- SetY(ny + tar_vy, false, true);
- else
- SetY(ny + tar_vy, false);
- }
-
- if (GetMap() != nullptr) {
- Cell* newCell = GetMap()->GetGrid()->GetCell(GetX(), GetZ());
- int32 newGrid = GetMap()->GetGrid()->GetGridID(this);
- if ((!IsFlyingCreature() || IsTransportSpawn()) && newGrid != 0 && newGrid != appearance.pos.grid_id)
- SetPos(&(appearance.pos.grid_id), newGrid);
- }
+ else {
+ SetX(nx + tar_vx, false);
+ SetZ(nz + tar_vz, false);
+ if ( IsWidget() )
+ SetY(ny + tar_vy, false, true);
+ else
+ SetY(ny + tar_vy, false);
+ }
+
+ if (GetMap() != nullptr) {
+ Cell* newCell = GetMap()->GetGrid()->GetCell(GetX(), GetZ());
+ int32 newGrid = GetMap()->GetGrid()->GetGridID(this);
+ if ((!IsFlyingCreature() || IsTransportSpawn()) && newGrid != 0 && newGrid != appearance.pos.grid_id)
+ SetPos(&(appearance.pos.grid_id), newGrid);
}
}
return remove_needed;
diff --git a/EQ2/source/WorldServer/Spawn.h b/EQ2/source/WorldServer/Spawn.h
index 0a44d3cc5..f5e954b77 100644
--- a/EQ2/source/WorldServer/Spawn.h
+++ b/EQ2/source/WorldServer/Spawn.h
@@ -1021,6 +1021,7 @@ public:
MovementLocation* GetCurrentRunningLocation();
MovementLocation* GetLastRunningLocation();
+ void NewWaypointChange(MovementLocation* data);
bool CalculateChange();
void AddRunningLocation(float x, float y, float z, float speed, float distance_away = 0, bool attackable = true, bool finished_adding_locations = true, string lua_function = "", bool isMapped=false);
bool RemoveRunningLocation();