From a5452512577922a8ee37204f1e9164c19705f16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Fri, 23 Jan 2015 01:00:00 +0100
Subject: [PATCH] Refactored "hovered" state, to be more like "playing" state
 for arena ships

---
 src/scripts/view/battle/Arena.ts      | 11 +++++++++--
 src/scripts/view/battle/BattleView.ts |  7 +------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/scripts/view/battle/Arena.ts b/src/scripts/view/battle/Arena.ts
index 9d86f30..ed05a43 100644
--- a/src/scripts/view/battle/Arena.ts
+++ b/src/scripts/view/battle/Arena.ts
@@ -16,6 +16,8 @@ module SpaceTac.View {
         // List of ship sprites
         private ship_sprites: ArenaShip[];
 
+        // Currently hovered ship
+        private hovered: ArenaShip;
         // Currently playing ship
         private playing: ArenaShip;
 
@@ -24,6 +26,7 @@ module SpaceTac.View {
             this.battleview = battleview;
             this.ship_sprites = [];
             this.playing = null;
+            this.hovered = null;
 
             super(battleview.game);
 
@@ -80,11 +83,15 @@ module SpaceTac.View {
         }
 
         // Set the hovered state on a ship sprite
-        setShipHovered(ship: Game.Ship, hovered: boolean): void {
+        setShipHovered(ship: Game.Ship): void {
+            if (this.hovered) {
+                this.hovered.setHovered(false);
+            }
             var arena_ship = this.findShipSprite(ship);
             if (arena_ship) {
-                arena_ship.setHovered(hovered);
+                arena_ship.setHovered(true);
             }
+            this.hovered = arena_ship;
         }
 
         // Set the playing state on a ship sprite
diff --git a/src/scripts/view/battle/BattleView.ts b/src/scripts/view/battle/BattleView.ts
index 5683235..932cb22 100644
--- a/src/scripts/view/battle/BattleView.ts
+++ b/src/scripts/view/battle/BattleView.ts
@@ -133,11 +133,9 @@ module SpaceTac.View {
 
         // Set the currently hovered ship
         setShipHovered(ship: Game.Ship): void {
-            if (this.ship_hovered) {
-                this.arena.setShipHovered(this.ship_hovered, false);
-            }
             this.ship_hovered = ship;
             this.card_hovered.setShip(ship);
+            this.arena.setShipHovered(ship);
             if (this.targetting) {
                 if (ship) {
                     this.targetting.setTargetShip(ship);
@@ -145,9 +143,6 @@ module SpaceTac.View {
                     this.targetting.unsetTarget();
                 }
             }
-            if (ship) {
-                this.arena.setShipHovered(this.ship_hovered, true);
-            }
         }
 
         // Enter targetting mode