Skip to content

OSX Compatibility Changes #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
incorpse wants to merge 3 commits into
base: master
Choose a base branch
from
Open

OSX Compatibility Changes #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ddcfb1
Multidimensional vector typedefs for Tripoint
incorpse Apr 24, 2014
62a41be
Utilize Tripoint 3D vector instead of 3D array
incorpse Apr 24, 2014
4f84d37
Header guard changed
incorpse Apr 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions geometry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,9 @@ struct Tripoint
return ret;
}
};
typedef std::vector<Tripoint> Tripoint1d;
typedef std::vector<Tripoint1d> Tripoint2d;
typedef std::vector<Tripoint2d> Tripoint3d;

inline Tripoint operator+(Tripoint lhs, const Tripoint& rhs)
{
Expand Down
2 changes: 1 addition & 1 deletion pathfind.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _TIME_H_
#define _TIME_H_
#ifndef _CATTIME_H_
#define _CATTIME_H_

#include <string>

Expand Down