Merge branch 'ints' into terrain

Conflicts fix, compiles, some test failures remain.
Trees not added, possibility of OM invalid handle assertion failures,
normals broken due to integer overflow in Newell's method.

1 files changed, 2 insertions, 0 deletions

diff --git a/game/objective.h b/game/objective.h
index 130015f..f5c6e48 100644
--- a/game/objective.h
+++ b/game/objective.h
@@ -10,6 +10,7 @@ class Orders;
 class Objective {
 public:
 	explicit Objective(Orders * os) : orders(os) { }
+
 	DEFAULT_MOVE_COPY(Objective);
 	virtual ~Objective() = default;
 
@@ -19,4 +20,5 @@ public:
 
 	Orders * orders;
 };
+
 using ObjectivePtr = std::unique_ptr<Objective>;