From d0b2740ddea28b20fd26d7dbd19149a76df129ff Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin@worthe-it.co.za>
Date: Wed, 4 Jul 2018 19:37:35 +0200
Subject: Added tests of indexing into random bitwise building

---
 src/engine/bitwise_engine.rs | 3 +++
 src/engine/geometry.rs       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/engine')

diff --git a/src/engine/bitwise_engine.rs b/src/engine/bitwise_engine.rs
index 31040bf..524ddf7 100644
--- a/src/engine/bitwise_engine.rs
+++ b/src/engine/bitwise_engine.rs
@@ -146,6 +146,9 @@ impl BitwiseGameState {
                 self.opponent_buildings.missiles[j].1 &= !move_down4;
             }
         }
+
+        self.player_buildings.unconstructed.sort_by_key(|b| b.pos);
+        self.opponent_buildings.unconstructed.sort_by_key(|b| b.pos);
     }
 
     pub fn sorted(&self) -> BitwiseGameState {
diff --git a/src/engine/geometry.rs b/src/engine/geometry.rs
index 02fe44b..af91b19 100644
--- a/src/engine/geometry.rs
+++ b/src/engine/geometry.rs
@@ -81,6 +81,6 @@ impl PartialOrd for Point {
 }
 impl Ord for Point {
     fn cmp(&self, other: &Point) -> Ordering {
-        self.x.cmp(&other.x).then(self.y.cmp(&other.y))
+        self.y.cmp(&other.y).then(self.x.cmp(&other.x))
     }
 }
-- 
cgit v1.2.3