nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-27 22:33:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

FTE/SERVER: Improve Waypoint Link Validation

Browse source
This commit is contained in:
cypress 2024-10-12 09:08:41 -07:00
parent 0a86a64995
commit c0b6e943be
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
source/server/ai/fte/waypoints_core.qc
View file

@ -218,9 +218,9 @@ float Link (entity from, entity to) {
float i; float i;
entity tempe; entity tempe;
for (i = 0; i < MAX_WAY_TARGETS; i++) { for (i = 0; i < MAX_WAY_TARGETS; i++) {
tempe = find (world, waynum, from.targets[i]); tempe = find(world, waynum, from.targets[i]);
if (tempe == world || tempe == to) { if (tempe == world || !from.targets[i]) {
from.targets[i] = to.waynum; from.targets[i] = to.waynum;
bprint(PRINT_HIGH, "Linked waypoint "); bprint(PRINT_HIGH, "Linked waypoint ");
bprint(PRINT_HIGH, to.waynum); bprint(PRINT_HIGH, to.waynum);
@ -253,24 +253,38 @@ void () Link_Waypoints =
return; return;
if (Waypoint_Linked_To(current_way, active_way)) { if (Waypoint_Linked_To(current_way, active_way)) {
bprint(PRINT_HIGH, "These waypoints are already linked!\n"); bprint(PRINT_HIGH, "[INFO]: These waypoints are already linked!\n");
return; return;
} }
float i; float i;
entity tempe; entity tempe;
for (i = 0; i < MAX_WAY_TARGETS; i++) { for (i = 0; i < MAX_WAY_TARGETS; i++) {
tempe = findfloat (world, waynum, active_way.targets[i]); // First pass - if the target field is blank no extra
// validation is needed, just link.
if (tempe == world) { if (!active_way.targets[i]) {
if (Link(active_way, current_way)) { if (Link(active_way, current_way))
return; return;
}
bprint(PRINT_HIGH, "[INFO]: Got Linkable Waypoints but Linking failed!\n");
return;
}
// Second pass - if the targets field is occupied
// check if the waypoint still exists, link if it
// does not.
if (find(world, waynum, active_way.targets[i]) == world) {
bprint(PRINT_HIGH, sprintf("[INFO]: Found Waypoint ID %s but not entity, overwriting link..\n", active_way.targets[i]));
if (Link(active_way, current_way))
return;
bprint(PRINT_HIGH, " ..Failed!\n");
return;
} }
} }
bprint(PRINT_HIGH, "[INFO]: All Waypoint links occupied for this Waypoint!\n");
bprint(PRINT_HIGH, "no targets remaining!\n");
} }