diff --git a/geometry.h b/geometry.h index e4ff522..1ac1b03 100644 --- a/geometry.h +++ b/geometry.h @@ -145,6 +145,9 @@ struct Tripoint return ret; } }; +typedef std::vector Tripoint1d; +typedef std::vector Tripoint2d; +typedef std::vector Tripoint3d; inline Tripoint operator+(Tripoint lhs, const Tripoint& rhs) { diff --git a/pathfind.cpp b/pathfind.cpp index 3b353ff..8f26d77 100644 --- a/pathfind.cpp +++ b/pathfind.cpp @@ -500,7 +500,7 @@ Path Pathfinder::path_a_star(Tripoint start, Tripoint end) A_star_status status[x_size][y_size][z_size]; int gscore[x_size][y_size][z_size]; int hscore[x_size][y_size][z_size]; - Tripoint parent[x_size][y_size][z_size]; + Tripoint3d parent(x_size, Tripoint2d(y_size, Tripoint1d(z_size))); if (border > 0) { int x0 = (start.x < end.x ? start.x : end.x); diff --git a/time.h b/time.h index 2722648..b8838cc 100644 --- a/time.h +++ b/time.h @@ -1,5 +1,5 @@ -#ifndef _TIME_H_ -#define _TIME_H_ +#ifndef _CATTIME_H_ +#define _CATTIME_H_ #include