From ef06cf93a3aae08d064c9125c931a926a4fe4258 Mon Sep 17 00:00:00 2001
From: ajuvercr <arthur.vercruysse@outlook.com>
Date: Fri, 17 Apr 2020 15:12:11 +0200
Subject: [PATCH] too late commit lol

---
 frontend/src/lib.rs   | 9 +++++++++
 frontend/www/index.ts | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib.rs b/frontend/src/lib.rs
index 331931b..fed5633 100644
--- a/frontend/src/lib.rs
+++ b/frontend/src/lib.rs
@@ -44,6 +44,11 @@ fn spr(from: f32) -> f32 {
 
 impl Circle {
     pub fn new(p1: &types::Planet, p2: &types::Planet) -> Self {
+        use std::f32::consts::PI;
+
+        let pi2 = 2.0 * PI;
+        console_log!("Test");
+
         let x1 = p1.x;
         let y1 = p1.y;
         let x2 = p2.x;
@@ -284,6 +289,10 @@ impl Game {
         }).collect();
     }
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> e5af4f4... too late commit lol
     fn update_ship_counts(&mut self) {
         self.ship_counts = self.states[self.turn].expeditions.iter().map(|s| {
             s.ship_count as usize
diff --git a/frontend/www/index.ts b/frontend/www/index.ts
index 3973777..f02ccbd 100644
--- a/frontend/www/index.ts
+++ b/frontend/www/index.ts
@@ -29,8 +29,8 @@ const COUNTER = new FPSCounter();
 const LOADER = document.getElementById("main");
 
 const SLIDER = <HTMLInputElement>document.getElementById("turnSlider");
-const FILESELECTOR = <HTMLInputElement> document.getElementById("fileselect");
-const SPEED = <HTMLInputElement> document.getElementById("speed");
+const FILESELECTOR = <HTMLInputElement>document.getElementById("fileselect");
+const SPEED = <HTMLInputElement>document.getElementById("speed");
 
 export function set_loading(loading: boolean) {
     if (loading) {