markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling and removed c++14 dependencies.

Browse source
This commit is contained in:
Dmitry 2019-05-07 16:23:15 +03:00 • committed by jeefo
commit 83cf81cbca
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/interface.cpp
View file

@ -361,7 +361,7 @@ int handleBotCommands (edict_t *ent, const char *arg0, const char *arg1, const c
for (int i = 0; i < waypoints.length (); i++) { for (int i = 0; i < waypoints.length (); i++) {
totalCleared += waypoints.removeUselessConnections (i, true); totalCleared += waypoints.removeUselessConnections (i, true);
} }
engine.print ("Done. Processed %d waypoints. %d useless paths cleared.", totalCleared); engine.print ("Done. Processed %d waypoints. %d useless paths cleared.", waypoints.length (), totalCleared);
} }
else { else {
int clearIndex = atoi (arg2), totalCleared = 0; int clearIndex = atoi (arg2), totalCleared = 0;

20
source/waypoint.cpp
View file

@ -172,7 +172,7 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
}; };
// check pass 0 // check pass 0
auto inspect_p0 = [&](const int id, const auto &self) -> bool { auto inspect_p0 = [&](const int id) -> bool {
if (id < 2) { if (id < 2) {
return false; return false;
} }
@ -217,7 +217,7 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX; sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX;
// do a second check // do a second check
return self (id, self); return true;
} }
else { else {
printInfo ("Failed to remove a useless (P.0) connection from index = %d to %d.", index, prev.index); printInfo ("Failed to remove a useless (P.0) connection from index = %d to %d.", index, prev.index);
@ -225,12 +225,12 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
} }
} }
} }
return true; return false;
}; };
for (int i = 2; i < MAX_PATH_INDEX; i++) { for (int i = 2; i < MAX_PATH_INDEX; i++) {
inspect_p0 (i, inspect_p0); while (inspect_p0 (i));
} }
// check pass 1 // check pass 1
@ -267,7 +267,7 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
top.reset (); top.reset ();
// check pass 2 // check pass 2
auto inspect_p2 = [&](const int id, const auto &self) -> bool { auto inspect_p2 = [&](const int id) -> bool {
if (id < 1) { if (id < 1) {
return false; return false;
} }
@ -305,9 +305,7 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
sorted[j] = cr::move (sorted[j + 1]); sorted[j] = cr::move (sorted[j + 1]);
} }
sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX; sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX;
return true;
// do a second check
return self (id, self);
} }
else { else {
printInfo ("Failed to remove a useless (P.2) connection from index = %d to %d.", index, cur.index); printInfo ("Failed to remove a useless (P.2) connection from index = %d to %d.", index, cur.index);
@ -341,7 +339,7 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX; sorted[MAX_PATH_INDEX - 1].index = INVALID_WAYPOINT_INDEX;
// do a second check // do a second check
return self (id, self); return true;
} }
else { else {
printInfo ("Failed to remove a useless (P.2) connection from index = %d to %d.", index, prev.index); printInfo ("Failed to remove a useless (P.2) connection from index = %d to %d.", index, prev.index);
@ -351,11 +349,11 @@ int Waypoint::removeUselessConnections (int index, bool outputToConsole) {
else { else {
top = cur; top = cur;
} }
return true; return false;
}; };
for (int i = 1; i < MAX_PATH_INDEX; i++) { for (int i = 1; i < MAX_PATH_INDEX; i++) {
inspect_p2 (i, inspect_p2); while (inspect_p2 (i));
} }
// check pass 3 // check pass 3