From ebae442b9bc8d63a2439a7262f5d0d3a6d050971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ruben=20M=C3=BCller?= <mail@rubenartus.com>
Date: Sat, 6 Dec 2014 17:26:12 +0100
Subject: [PATCH] Changes

---
 src/entities/tile.coffee |  2 +-
 src/game.coffee          | 18 ++++++++++++++++++
 src/main.coffee          | 15 ---------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/entities/tile.coffee b/src/entities/tile.coffee
index cba6637..e042da6 100644
--- a/src/entities/tile.coffee
+++ b/src/entities/tile.coffee
@@ -13,7 +13,7 @@ class Tile extends BaseEntity
 
   click: (button)->
     # console.log button
-    @isSelected = true
+    # @isSelected = true
 
   moveIn: ->
     @isActive = true
diff --git a/src/game.coffee b/src/game.coffee
index 9f0eef3..e4958a2 100644
--- a/src/game.coffee
+++ b/src/game.coffee
@@ -5,6 +5,8 @@ app.game =
 
     @miners = []
     @miners.push = new Miner
+    
+    @currentHoveredTile = new Tile
 
   render: ->
     app.layer.save().scale(5, 5)
@@ -20,6 +22,22 @@ app.game =
 
   step: ->
 
+  mousedown: (event)->
+    @posToTile(event.x, event.y).click(event.button)
+
+  mousemove: (event)->
+    tile = @posToTile(event.x, event.y)
+
+    if tile
+      if tile != @currentHoveredTile
+        tile.moveIn()
+        @currentHoveredTile.moveOut()
+        @currentHoveredTile = tile
+
+  posToTile: (x, y)->
+    pos = (Math.floor(y/8/5)*20) + Math.floor(x/8/5)
+    @map[pos]
+
   map: []
 
   resources:
diff --git a/src/main.coffee b/src/main.coffee
index 68890a4..a9c5f90 100644
--- a/src/main.coffee
+++ b/src/main.coffee
@@ -6,7 +6,6 @@ app = playground({
 
   create: ->
     @loadImages "layers", "active", "selected", "entities"
-    @currentHoveredTile = new Tile
   
   ready: ->
     @game.start()
@@ -14,22 +13,8 @@ app = playground({
   
   step: ->
 
-  mousedown: (event)->
-    @posToTile(event.x, event.y).click(event.button)
-
-  mousemove: (event)->
-    tile = @posToTile(event.x, event.y)
-    if tile != @currentHoveredTile
-      tile.moveIn()
-      @currentHoveredTile.moveOut()
-      @currentHoveredTile = tile
-
   render: ->
     @layer.clear "#00f"
     @game.render()
-
-  posToTile: (x, y)->
-    pos = (Math.floor(y/8/5)*20) + Math.floor(x/8/5)
-    @game.map[pos]
    
   })