...

3 files changed, 17 insertions, 12 deletions

diff --git a/src/battle/src/View/Map.elm b/src/battle/src/View/Map.elm
index d95aa21..babfcaf 100644
--- a/src/battle/src/View/Map.elm
+++ b/src/battle/src/View/Map.elm
@@ -20,6 +20,7 @@ import BattleMap.View.Tile
 -- Local Module ----------------------------------------------------------------
 import Constants.UI
 
+import Struct.Battle
 import Struct.Character
 import Struct.Event
 import Struct.Model
@@ -98,17 +99,17 @@ maybe_print_navigator interactive maybe_nav =
             (Util.Html.nothing)
 
 get_characters_html : (
-      Struct.Model.Type ->
+      Struct.Battle.Type ->
       (Html.Html Struct.Event.Type)
    )
-get_characters_html model =
+get_characters_html battle =
    (Html.div
       [
          (Html.Attributes.class "characters")
       ]
       (List.map
-         (View.Map.Character.get_html model)
-         (Array.toList (Struct.Battle.get_characters model.battle))
+         (View.Map.Character.get_html)
+         (Array.toList (Struct.Battle.get_characters battle))
       )
    )
 
@@ -142,7 +143,7 @@ get_html model =
       ]
       [
          (Html.Lazy.lazy (get_tiles_html) model.battle.map),
-         (Html.Lazy.lazy (get_characters_html model)),
+         (Html.Lazy.lazy (get_characters_html) model.battle),
          (Html.Lazy.lazy2
             (maybe_print_navigator)
             True
diff --git a/src/battle/src/View/MessageBoard.elm b/src/battle/src/View/MessageBoard.elm
index aebda2a..77ceccf 100644
--- a/src/battle/src/View/MessageBoard.elm
+++ b/src/battle/src/View/MessageBoard.elm
@@ -25,9 +25,13 @@ display : (
    )
 display model message =
    case message of
-      (Error error_msg) -> (View.MessageBoard.Error.get_html model error_msg)
-      (AttackReport attack) -> (View.MessageBoard.Attack.get_html model attack)
-      (Help help_request) ->
+      (Struct.MessageBoard.Error error_msg) ->
+         (View.MessageBoard.Error.get_html model error_msg)
+
+      (Struct.MessageBoard.AttackReport attack) ->
+         (View.MessageBoard.Attack.get_html model attack)
+
+      (Struct.MessageBoard.Help help_request) ->
          (View.MessageBoard.Help.get_html model help_request)
 
 --------------------------------------------------------------------------------
diff --git a/src/battle/src/View/SubMenu/Status.elm b/src/battle/src/View/SubMenu/Status.elm
index af5ace3..e08e786 100644
--- a/src/battle/src/View/SubMenu/Status.elm
+++ b/src/battle/src/View/SubMenu/Status.elm
@@ -13,6 +13,7 @@ import BattleMap.Struct.Location
 import BattleMap.View.TileInfo
 
 -- Local Module ----------------------------------------------------------------
+import Struct.Battle
 import Struct.Event
 import Struct.Model
 import Struct.UI
@@ -38,17 +39,16 @@ get_html model =
             (Just (Struct.UI.SelectedLocation loc)) ->
                (Html.Lazy.lazy3
                   (BattleMap.View.TileInfo.get_html)
-                  model.map_dataset
+                  model.map_data_set
                   loc
                   model.battle.map
                )
 
             (Just (Struct.UI.SelectedCharacter target_char)) ->
-               case (Array.get target_char model.characters) of
+               case (Struct.Battle.get_character target_char model.battle) of
                   (Just char) ->
-                     (Html.Lazy.lazy2
+                     (Html.Lazy.lazy
                         (View.SubMenu.Status.CharacterInfo.get_html)
-                        model.player_ix
                         char
                      )