veitR/mod-playerbots
1
0
Fork 0
mirror of https://github.com/liyunfan1223/mod-playerbots.git synced 2026-02-20 18:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Crash fix] Circle formation

Browse Source
This commit is contained in:
Yunfan Li 2024-08-25 11:19:00 +08:00
parent 1a8fcc628c
commit 4b62d99c92
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/strategy/values/Formations.cpp
View File

@ -90,7 +90,7 @@ public:
float y = master->GetPositionY() + sin(angle) * range; float y = master->GetPositionY() + sin(angle) * range;
float z = master->GetPositionZ(); float z = master->GetPositionZ();
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(),
master->GetPositionZ(), x, y, z)) master->GetPositionZ(), x, y, z))
{ {
x = master->GetPositionX() + cos(angle) * range; x = master->GetPositionX() + cos(angle) * range;
y = master->GetPositionY() + sin(angle) * range; y = master->GetPositionY() + sin(angle) * range;
@ -140,8 +140,8 @@ public:
float y = master->GetPositionY() + sin(angle) * range + dy; float y = master->GetPositionY() + sin(angle) * range + dy;
float z = master->GetPositionZ(); float z = master->GetPositionZ();
z = bot->GetMapHeight(x, y, z + 5.0f); z = bot->GetMapHeight(x, y, z + 5.0f);
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!master->GetMap()->CheckCollisionAndGetValidCoords(
master->GetPositionZ(), x, y, z)) master, master->GetPositionX(), master->GetPositionY(), master->GetPositionZ(), x, y, z))
{ {
x = master->GetPositionX() + cos(angle) * range + dx; x = master->GetPositionX() + cos(angle) * range + dx;
y = master->GetPositionY() + sin(angle) * range + dy; y = master->GetPositionY() + sin(angle) * range + dy;
@ -158,13 +158,13 @@ public:
float z = master->GetPositionZ(); float z = master->GetPositionZ();
z = bot->GetMapHeight(x, y, z + 5.0f); z = bot->GetMapHeight(x, y, z + 5.0f);
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(),
master->GetPositionZ(), x, y, z)) master->GetPositionZ(), x, y, z))
{ {
x = master->GetPositionX() + cos(angle) * range + dx; x = master->GetPositionX() + cos(angle) * range + dx;
y = master->GetPositionY() + sin(angle) * range + dy; y = master->GetPositionY() + sin(angle) * range + dy;
z = master->GetPositionZ() + master->GetHoverHeight(); z = master->GetPositionZ() + master->GetHoverHeight();
z = master->GetMapHeight(x, y, z); z = master->GetMapHeight(x, y, z);
} }
return WorldLocation(master->GetMapId(), x, y, z); return WorldLocation(master->GetMapId(), x, y, z);
} }
@ -216,13 +216,13 @@ public:
float x = target->GetPositionX() + cos(angle) * range; float x = target->GetPositionX() + cos(angle) * range;
float y = target->GetPositionY() + sin(angle) * range; float y = target->GetPositionY() + sin(angle) * range;
float z = target->GetPositionZ(); float z = target->GetPositionZ();
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!target->GetMap()->CheckCollisionAndGetValidCoords(target, target->GetPositionX(), target->GetPositionY(),
master->GetPositionZ(), x, y, z)) target->GetPositionZ(), x, y, z))
{ {
x = target->GetPositionX() + cos(angle) * range; x = target->GetPositionX() + cos(angle) * range;
y = target->GetPositionY() + sin(angle) * range; y = target->GetPositionY() + sin(angle) * range;
z = target->GetPositionZ() + target->GetHoverHeight(); z = target->GetPositionZ() + target->GetHoverHeight();
z = master->GetMapHeight(x, y, z); z = target->GetMapHeight(x, y, z);
} }
return WorldLocation(bot->GetMapId(), x, y, z); return WorldLocation(bot->GetMapId(), x, y, z);
} }
@ -383,8 +383,8 @@ public:
if (minDist) if (minDist)
{ {
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!master->GetMap()->CheckCollisionAndGetValidCoords(
master->GetPositionZ(), x, y, z)) master, master->GetPositionX(), master->GetPositionY(), master->GetPositionZ(), x, y, z))
{ {
x = master->GetPositionX() + cos(angle) * range + cos(followAngle) * followRange; x = master->GetPositionX() + cos(angle) * range + cos(followAngle) * followRange;
y = master->GetPositionY() + sin(angle) * range + sin(followAngle) * followRange; y = master->GetPositionY() + sin(angle) * range + sin(followAngle) * followRange;
@ -398,7 +398,7 @@ public:
} }
if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(), if (!master->GetMap()->CheckCollisionAndGetValidCoords(master, master->GetPositionX(), master->GetPositionY(),
master->GetPositionZ(), x, y, z)) master->GetPositionZ(), x, y, z))
{ {
x = master->GetPositionX() + cos(angle) * range + cos(followAngle) * followRange; x = master->GetPositionX() + cos(angle) * range + cos(followAngle) * followRange;
y = master->GetPositionY() + sin(angle) * range + sin(followAngle) * followRange; y = master->GetPositionY() + sin(angle) * range + sin(followAngle) * followRange;