Got everything to compile again.

9 files changed, 29 insertions, 24 deletions

diff --git a/src/map-editor/src/Comm/AddTile.elm b/src/map-editor/src/Comm/AddTile.elm
index d0a3ce8..797731b 100644
--- a/src/map-editor/src/Comm/AddTile.elm
+++ b/src/map-editor/src/Comm/AddTile.elm
@@ -3,8 +3,10 @@ module Comm.AddTile exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
-import Struct.Tile
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.Tile
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -14,11 +16,11 @@ import Struct.ServerReply
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-internal_decoder : Struct.Tile.Type -> Struct.ServerReply.Type
+internal_decoder : BattleMap.Struct.Tile.Type -> Struct.ServerReply.Type
 internal_decoder wp = (Struct.ServerReply.AddTile wp)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
 decode : (Json.Decode.Decoder Struct.ServerReply.Type)
-decode = (Json.Decode.map (internal_decoder) (Struct.Tile.decoder))
+decode = (Json.Decode.map (internal_decoder) (BattleMap.Struct.Tile.decoder))
diff --git a/src/map-editor/src/Comm/AddTilePattern.elm b/src/map-editor/src/Comm/AddTilePattern.elm
index bf9b15d..603e743 100644
--- a/src/map-editor/src/Comm/AddTilePattern.elm
+++ b/src/map-editor/src/Comm/AddTilePattern.elm
@@ -3,7 +3,7 @@ module Comm.AddTilePattern exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.TilePattern
 import Struct.ServerReply
 
diff --git a/src/map-editor/src/Comm/LoadMap.elm b/src/map-editor/src/Comm/LoadMap.elm
index 2d53e80..b420d26 100644
--- a/src/map-editor/src/Comm/LoadMap.elm
+++ b/src/map-editor/src/Comm/LoadMap.elm
@@ -3,7 +3,7 @@ module Comm.LoadMap exposing (try)
 -- Elm -------------------------------------------------------------------------
 import Json.Encode
 
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.Send
 
 import Constants.IO
diff --git a/src/map-editor/src/Comm/LoadTilePatterns.elm b/src/map-editor/src/Comm/LoadTilePatterns.elm
index b730642..d50c686 100644
--- a/src/map-editor/src/Comm/LoadTilePatterns.elm
+++ b/src/map-editor/src/Comm/LoadTilePatterns.elm
@@ -1,8 +1,6 @@
 module Comm.LoadTilePatterns exposing (try)
 
--- Elm -------------------------------------------------------------------------
-
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.Send
 
 import Constants.IO
diff --git a/src/map-editor/src/Comm/LoadTiles.elm b/src/map-editor/src/Comm/LoadTiles.elm
index 6175e7a..6632d18 100644
--- a/src/map-editor/src/Comm/LoadTiles.elm
+++ b/src/map-editor/src/Comm/LoadTiles.elm
@@ -1,8 +1,6 @@
 module Comm.LoadTiles exposing (try)
 
--- Elm -------------------------------------------------------------------------
-
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.Send
 
 import Constants.IO
diff --git a/src/map-editor/src/Comm/Okay.elm b/src/map-editor/src/Comm/Okay.elm
index ca7a2eb..3d29375 100644
--- a/src/map-editor/src/Comm/Okay.elm
+++ b/src/map-editor/src/Comm/Okay.elm
@@ -3,7 +3,7 @@ module Comm.Okay exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
diff --git a/src/map-editor/src/Comm/Send.elm b/src/map-editor/src/Comm/Send.elm
index 4371b07..c7b2f39 100644
--- a/src/map-editor/src/Comm/Send.elm
+++ b/src/map-editor/src/Comm/Send.elm
@@ -6,7 +6,7 @@ import Http
 import Json.Decode
 import Json.Encode
 
--- Battlemap -------------------------------------------------------------------
+-- Local Module ----------------------------------------------------------------
 import Comm.AddTile
 import Comm.AddTilePattern
 import Comm.Okay
diff --git a/src/map-editor/src/Comm/SendMapUpdate.elm b/src/map-editor/src/Comm/SendMapUpdate.elm
index d2ae2c9..023f24c 100644
--- a/src/map-editor/src/Comm/SendMapUpdate.elm
+++ b/src/map-editor/src/Comm/SendMapUpdate.elm
@@ -5,15 +5,17 @@ import Array
 
 import Json.Encode
 
--- Map -------------------------------------------------------------------
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.Map
+import BattleMap.Struct.TileInstance
+
+-- Local Module ----------------------------------------------------------------
 import Constants.IO
 
 import Comm.Send
 
 import Struct.Event
-import Struct.Map
 import Struct.Model
-import Struct.TileInstance
 
 --------------------------------------------------------------------------------
 -- TYPES ------------------------------------------------------------------------
@@ -30,13 +32,16 @@ encode_map model =
             ("stk", (Json.Encode.string model.session_token)),
             ("pid", (Json.Encode.string model.player_id)),
             ("mid", (Json.Encode.string model.map_id)),
-            ("w", (Json.Encode.int (Struct.Map.get_width model.map))),
-            ("h", (Json.Encode.int (Struct.Map.get_height model.map))),
+            ("w", (Json.Encode.int (BattleMap.Struct.Map.get_width model.map))),
+            (
+               "h",
+               (Json.Encode.int (BattleMap.Struct.Map.get_height model.map))
+            ),
             (
                "t",
                (Json.Encode.list
-                  (Struct.TileInstance.encode)
-                  (Array.toList (Struct.Map.get_tiles model.map))
+                  (BattleMap.Struct.TileInstance.encode)
+                  (Array.toList (BattleMap.Struct.Map.get_tiles model.map))
                )
             )
          ]
diff --git a/src/map-editor/src/Comm/SetMap.elm b/src/map-editor/src/Comm/SetMap.elm
index 10d527a..80f6db1 100644
--- a/src/map-editor/src/Comm/SetMap.elm
+++ b/src/map-editor/src/Comm/SetMap.elm
@@ -3,8 +3,10 @@ module Comm.SetMap exposing (decode)
 -- Elm -------------------------------------------------------------------------
 import Json.Decode
 
--- Map -------------------------------------------------------------------------
-import Struct.Map
+-- Battle Map ------------------------------------------------------------------
+import BattleMap.Struct.Map
+
+-- Local Module ----------------------------------------------------------------
 import Struct.ServerReply
 
 --------------------------------------------------------------------------------
@@ -22,5 +24,5 @@ decode : (Json.Decode.Decoder Struct.ServerReply.Type)
 decode =
    (Json.Decode.map
       (\map -> (Struct.ServerReply.SetMap map))
-      (Struct.Map.decoder)
+      (BattleMap.Struct.Map.decoder)
    )