Skip to content

Crashfix with underwater giant NavMesh #3149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Wall-core wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Crashfix with underwater giant NavMesh #3149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/game/Objects/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,9 +1952,12 @@ bool WorldObject::GetRandomPoint(float x, float y, float z, float distance, floa
rand_z = z;
if (pMap->GetWalkRandomPosition(GetTransport(), rand_x, rand_y, rand_z, distance, moveAllowed))
{
// Giant type creatures walk underwater
if ((pUnit && !pUnit->CanSwim()) ||
(IsCreature() && !pUnit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_USE_SWIM_ANIMATION)))
// Can't swim, so walk
if ((pUnit && !pUnit->CanSwim()))
return true;

// Giant type creatures lack USE_SWIM_ANIMATION flag, and walk underwater
if (pUnit && pUnit->IsCreature() && !pUnit->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_USE_SWIM_ANIMATION))
return true;

// The position returned by the pathfinding is at the bottom of the water. We're randomizing it a bit...
Expand Down