From ee81e861a2f10f43beade10ccc0770098b0d6c95 Mon Sep 17 00:00:00 2001 From: John Bytheway Date: Thu, 11 Jun 2020 19:36:25 -0400 Subject: [PATCH] Update point code in point.h, basecamp.h Doing headers separately to avoid edit collisions. --- src/basecamp.h | 2 +- src/point.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basecamp.h b/src/basecamp.h index 08b595fa76b6c..df894e6c54bae 100644 --- a/src/basecamp.h +++ b/src/basecamp.h @@ -81,7 +81,7 @@ extern const std::map all_directions; point direction_from_id( const std::string &id ); -const point base_dir = point_zero; +const point base_dir; const std::string prefix = "faction_base_"; const std::string id = "FACTION_CAMP"; const int prefix_len = 13; diff --git a/src/point.h b/src/point.h index b14fcec8d9b2d..2cb4fbef5800d 100644 --- a/src/point.h +++ b/src/point.h @@ -279,7 +279,7 @@ struct box { } }; -static constexpr tripoint tripoint_zero { 0, 0, 0 }; +static constexpr tripoint tripoint_zero; static constexpr point point_zero{ tripoint_zero.xy() }; static constexpr point point_north{ 0, -1 };