vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Waypoint-system: Add 'sv way addnear' which will create a node auto-linked

Browse source 
to the nearest node to the player.
This commit is contained in:
Marco Cawthorne 2021-12-18 16:36:51 -08:00
parent 30e0ca9ad5
commit 5637d49189
Signed by: eukara
GPG key ID: C196CD8BA993248A
2 changed files with 40 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/botlib/way.qc
View file

@ -93,9 +93,39 @@ Way_AutoLink(int wpidx)
}
}
int
Way_FindClosestNode(vector vecOrigin)
{
/* -1 for no nodes anywhere... */
int r = -1i;
float flBestDist = COST_INFINITE;
for (int i = 0i; i < g_iWaypoints; i++) {
float fDist = vlen(g_pWaypoints[i].m_vecOrigin - vecOrigin) - g_pWaypoints[i].m_flRadius;
if (fDist < flBestDist) {
/* within the waypoint's radius */
if (fDist < 0) {
flBestDist = fDist;
r = i;
} else {
/* outside the waypoint, make sure its valid. */
traceline(vecOrigin, g_pWaypoints[i].m_vecOrigin, TRUE, world);
if (trace_fraction == 1) {
/* FIXME: sort them frst, to avoid traces? */
flBestDist = fDist;
r = i;
}
}
}
}
return r;
}
void
Way_CreateNode(entity ePlayer, int iAutoLink)
{
int iNearest = Way_FindClosestNode(self.origin);
int iID = g_iWaypoints++;
g_pWaypoints = (waypoint_t *)memrealloc(g_pWaypoints, sizeof(waypoint_t), iID, g_iWaypoints);
waypoint_t *n = g_pWaypoints + iID;
@ -115,6 +145,9 @@ Way_CreateNode(entity ePlayer, int iAutoLink)
Way_LinkNodes(&g_pWaypoints[iID-1], n);
} else if (iAutoLink == -2) {
Way_LinkNodes(n, &g_pWaypoints[iID-1]);
} else if (iAutoLink == -4) {
Way_LinkNodes(n, &g_pWaypoints[iNearest]);
Way_LinkNodes(&g_pWaypoints[iNearest], n);
}
}
}
@ -159,35 +192,6 @@ Way_SetRadius(int iID, float flRadValue)
g_pWaypoints[iID].m_flRadius = flRadValue;
}
int
Way_FindClosestNode(vector vecOrigin)
{
/* -1 for no nodes anywhere... */
int r = -1i;
float flBestDist = COST_INFINITE;
for (int i = 0i; i < g_iWaypoints; i++) {
float fDist = vlen(g_pWaypoints[i].m_vecOrigin - vecOrigin) - g_pWaypoints[i].m_flRadius;
if (fDist < flBestDist) {
/* within the waypoint's radius */
if (fDist < 0) {
flBestDist = fDist;
r = i;
} else {
/* outside the waypoint, make sure its valid. */
traceline(vecOrigin, g_pWaypoints[i].m_vecOrigin, TRUE, world);
if (trace_fraction == 1) {
/* FIXME: sort them frst, to avoid traces? */
flBestDist = fDist;
r = i;
}
}
}
}
return r;
}
void
Way_FlagJump(void)
{
@ -597,6 +601,9 @@ Way_Cmd(void)
case "addntl":
Way_CreateNode(self, -2);
break;
case "addnear":
Way_CreateNode(self, -4);
break;
case "addspawns":
Way_HelperSpawns();
break;

4
src/client/way.qc
View file

@ -59,6 +59,7 @@ Way_Init(void)
"2.\tAdd ^1Chain^7 Waypoint^7 (last-to-new)\n" \
"3.\tAdd ^1Autolink^7 Waypoint\n" \
"4.\tAdd ^1Spawnpoint^7 Waypoints\n" \
"5.\tAdd ^1Chain-To-Nearest^7 Waypoint\n" \
"\n" \
"\n" \
"7.\tRemove nearest\n" \
@ -250,6 +251,9 @@ WAY_ADD(int n)
case 4:
localcmd("sv way addspawns\n");
break;
case 5:
localcmd("sv way addnear\n");
break;
case 7:
localcmd("sv way delete\n");
break;