KlemenPl/PixelDefense
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup smoothPath function

Browse Source
This commit is contained in:
Klemen Plestenjak
2023-11-25 11:30:28 +01:00
parent 6240eeea1c
commit 6fe4449adf
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
game/pathfinding.c
View File

@@ -52,11 +52,12 @@ static void smoothPath(BzTileMap *map, PathData *pathData, BzObjectPool *pool) {
#define NEXT_WAYPOINT(path, idx, len) \ #define NEXT_WAYPOINT(path, idx, len) \
do { \ do { \
if (idx >= len) { \ idx++; \
if (idx >= len) { \
path = path->next; \ path = path->next; \
idx = 0; \ idx = 0; \
if (path) len = path->numWaypoints; \ if (path) len = path->numWaypoints; \
} \ } \
} while (0) } while (0)
PathData *currPath = pathData; PathData *currPath = pathData;
@@ -68,12 +69,9 @@ do { \
size_t nextPathLen = nextPath->numWaypoints; size_t nextPathLen = nextPath->numWaypoints;
// Second element // Second element
currIdx++;
NEXT_WAYPOINT(currPath, currIdx, currPathLen); NEXT_WAYPOINT(currPath, currIdx, currPathLen);
// Third element // Third element
nextIdx++;
NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen); NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen);
nextIdx++;
NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen); NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen);
outPath->numWaypoints = 1; outPath->numWaypoints = 1;
@@ -82,9 +80,6 @@ do { \
Position nextPos = nextPath->waypoints[nextIdx]; Position nextPos = nextPath->waypoints[nextIdx];
lastPos = nextPos; lastPos = nextPos;
currIdx++;
nextIdx++;
NEXT_WAYPOINT(currPath, currIdx, currPathLen); NEXT_WAYPOINT(currPath, currIdx, currPathLen);
NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen); NEXT_WAYPOINT(nextPath, nextIdx, nextPathLen);